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

16 KiB

Raw Blame History

View Raw