[FFmpeg-cvslog] Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'
Michael Niedermayer
git at videolan.org
Thu Nov 14 16:01:10 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 15:42:05 2013 +0100| [a24aef5dfa5117008c74ee2149346eebe325349d] | committer: Michael Niedermayer
Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'
* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4':
twinvq: support multiple frames per packet
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a24aef5dfa5117008c74ee2149346eebe325349d
---
More information about the ffmpeg-cvslog
mailing list