[FFmpeg-cvslog] Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
Michael Niedermayer
git at videolan.org
Sun Jun 16 23:34:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 23:29:37 2013 +0200| [301522f521f05c998fb8dfba153d49e557604507] | committer: Michael Niedermayer
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
bitstream: forward error values and drop few abort()
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=301522f521f05c998fb8dfba153d49e557604507
---
More information about the ffmpeg-cvslog
mailing list