[FFmpeg-cvslog] Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4

Michael Niedermayer git at videolan.org
Sun Jan 18 02:50:13 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:39:51 2015 +0100| [65b2973a543366fe398e9f376fa0ec0bda030b0a] | committer: Michael Niedermayer

Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4

* commit '21aeae9c679657a1537d0d9127eff280bafc901a':
  svq1enc: check ff_get_buffer return value

Conflicts:
	libavcodec/svq1enc.c

See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list