[FFmpeg-cvslog] Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
Michael Niedermayer
git at videolan.org
Sun Jul 14 12:17:06 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 14 12:10:38 2013 +0200| [ac20ba35e37dac843c9692a02a63e6a6e3bcce36] | committer: Michael Niedermayer
Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
* commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5':
ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac20ba35e37dac843c9692a02a63e6a6e3bcce36
---
More information about the ffmpeg-cvslog
mailing list