diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 14:53:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 15:13:53 +0200 |
| commit | 67d501b4f1758ba0783b14da4a6b3abd506792fa (patch) | |
| tree | d9160dbe01eead7675731eaecfcabb24616fa79d /libavformat/cafdec.c | |
| parent | b90210e9c5ea365befef61b10b9a34ce37f9e679 (diff) | |
| parent | 1b3439b3055b083df51d7f7838ecc6b3f708b15c (diff) | |
| download | ffmpeg-67d501b4f1758ba0783b14da4a6b3abd506792fa.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavformat/cafdec.c')
0 files changed, 0 insertions, 0 deletions