[FFmpeg-cvslog] Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 01:27:48 2014 +0100| [bd9492174d978f9d8b82d945cda9b5a52f0fa437] | committer: Michael Niedermayer

Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'

* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
	libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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