Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 13:44:21 +0000 (15:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 14:35:24 +0000 (16:35 +0200)
commit36f862e04c2afe37c1fd541e01013c6cef4c6015
tree3983371af49a7234d87bf999b35b17875db09a64
parent07a79cf8694ac685ae8f579ccc33d113eb46fe3d
parenta0f2946068c62e18cb05ac25c0df3d86077251a6
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>
12 files changed:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb_template.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/svq3.c
libavcodec/vaapi_h264.c
libavcodec/vda_h264.c
libavcodec/vdpau.c
libavcodec/vdpau_h264.c