[FFmpeg-cvslog] Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b'
Michael Niedermayer
git at videolan.org
Thu Nov 14 16:15:13 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 16:01:57 2013 +0100| [726566704f3258b1f4b9fbe2bcb69e1fe752ed09] | committer: Michael Niedermayer
Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b'
* commit '669fe505952f3d8175b1ad6971033a8e8120523b':
twinvq: consume block_align+1 packets as full ones
Conflicts:
libavcodec/twinvq.c
See: 2e7a1fdd6d51aec59931ce7b278b12faa66f98fd
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=726566704f3258b1f4b9fbe2bcb69e1fe752ed09
---
More information about the ffmpeg-cvslog
mailing list