[FFmpeg-cvslog] Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'

Michael Niedermayer git at videolan.org
Thu Nov 13 15:03:26 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 14:53:14 2014 +0100| [45660c7d1b76185de97160808d81885f9dd08e23] | committer: Michael Niedermayer

Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'

* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
  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=45660c7d1b76185de97160808d81885f9dd08e23
---





More information about the ffmpeg-cvslog mailing list