[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

Michael Niedermayer git at videolan.org
Mon Jan 20 20:06:05 CET 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 20 19:54:41 2014 +0100| [78e39aa7ee12bb61cf34d8ca6bebd129d659d9cd] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a possible overflow when reading Nikon avi files.
  Add h263dsp dependency to mpeg1video and mpeg2video encoders.
  Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc

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

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

More information about the ffmpeg-cvslog mailing list