FFmpeg/libavcodec
Michael Niedermayer 36f862e04c Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'
* commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6':
  h264: use properly allocated AVFrames

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_refs.c
	libavcodec/h264_slice.c
	libavcodec/svq3.c
	libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29 16:35:24 +02:00
..
2015-03-10 23:33:57 +01:00
2015-04-18 14:13:59 -03:00
2015-04-20 04:11:23 +02:00
2015-04-22 17:45:51 +02:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-03-14 14:05:25 +01:00
2015-04-19 23:45:35 +01:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-28 00:04:58 +02:00
2015-04-24 00:00:20 -07:00
2015-04-24 00:00:12 -07:00
2015-04-20 14:36:41 +02:00
2015-03-16 13:04:47 +01:00
2015-04-24 16:54:31 +02:00
2015-04-18 18:07:54 -03:00