[FFmpeg-cvslog] Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
Michael Niedermayer
git at videolan.org
Thu Aug 29 14:04:18 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 14:01:28 2013 +0200| [18a9deedb0b0da2d6675e14ecbb270477b7186b7] | committer: Michael Niedermayer
Merge commit '91d4cfb8127f1de6c4ad173a30fffe584700046d'
* commit '91d4cfb8127f1de6c4ad173a30fffe584700046d':
apedec: do not buffer decoded samples over AVPackets
Conflicts:
libavcodec/apedec.c
See: 77d89a5b160127b5b60ba0310cb999077a22525d
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18a9deedb0b0da2d6675e14ecbb270477b7186b7
---
More information about the ffmpeg-cvslog
mailing list