[FFmpeg-cvslog] Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
Michael Niedermayer
git at videolan.org
Wed Oct 24 13:46:56 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 24 13:31:46 2012 +0200| [f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4] | committer: Michael Niedermayer
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
* commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff':
mp3: exit on parsing error in mp_decode_frame
rtmppkt: Avoid unescaped backslash in Doxygen comment
fate-lavfi: replace sed/grep/cut combos with awk
build: Plan 9 support
Conflicts:
configure
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4
---
More information about the ffmpeg-cvslog
mailing list