[FFmpeg-cvslog] Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'
Michael Niedermayer
git at videolan.org
Sat Jan 4 01:42:41 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 4 01:35:17 2014 +0100| [4a055f91bec2f746517ec7757e2b2a3bbdb90027] | committer: Michael Niedermayer
Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'
* commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d':
pmpdec: check that there is at least one audio packet.
Conflicts:
libavformat/pmpdec.c
See: 8b1cd25ca7e64e6128fa2902d78e48bfeeec9786
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a055f91bec2f746517ec7757e2b2a3bbdb90027
---
More information about the ffmpeg-cvslog
mailing list