[FFmpeg-cvslog] Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'

Michael Niedermayer git at videolan.org
Wed Mar 6 23:52:02 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  6 23:47:10 2013 +0100| [90f8b2ce48cfbffeb64779a8c2d55a1e078b4657] | committer: Michael Niedermayer

Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'

* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a':
  shorten: report meaningful errors

Conflicts:
	libavcodec/shorten.c

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

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





More information about the ffmpeg-cvslog mailing list