[FFmpeg-cvslog] Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'
Michael Niedermayer
git at videolan.org
Wed Sep 19 15:29:34 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 19 14:53:53 2012 +0200| [67d501b4f1758ba0783b14da4a6b3abd506792fa] | committer: Michael Niedermayer
Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'
* commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c':
mpegvideo: move frame size dependent memory management to separate functions
configure: add --toolchain option
configure: Make the smoothstreaming muxer enable the ismv muxer
smoothstreaming: Export the mp4 codec tags
mov: check for EOF in long lasting loops
avcodec: cleanup utils.c
binkaudio: remove unneeded GET_BITS_SAFE macro
binkaudio: use float sample format
binkaudio: use a different value for the coefficient scale for the DCT codec
Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67d501b4f1758ba0783b14da4a6b3abd506792fa
---
More information about the ffmpeg-cvslog
mailing list