[FFmpeg-cvslog] Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'
Michael Niedermayer
git at videolan.org
Thu Jan 10 10:32:23 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 10:18:35 2013 +0100| [70a65ecabff00a8330a56ceb51b15d10cb5b5389] | committer: Michael Niedermayer
Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'
* commit '9a7b56883d1333cdfcdf0fa7584a333841b86114':
au: set bit rate
au: validate bits-per-sample separately from codec tag
rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70a65ecabff00a8330a56ceb51b15d10cb5b5389
---
More information about the ffmpeg-cvslog
mailing list