[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Fri Apr 27 23:02:50 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 27 22:44:52 2012 +0200| [28c5775183e528c24a597b01497159d9d4c5e2a6] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegts: Make sure we don't return uninitialized packets
gitignore: replace library catch-all pattern by more specific patterns
Conflicts:
.gitignore
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28c5775183e528c24a597b01497159d9d4c5e2a6
---
More information about the ffmpeg-cvslog
mailing list