[FFmpeg-cvslog] Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 15:44:21 2015 +0200| [36f862e04c2afe37c1fd541e01013c6cef4c6015] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36f862e04c2afe37c1fd541e01013c6cef4c6015
---