• Michael Niedermayer's avatar
    Merge commit '1b3439b3' · 67d501b4
    Michael Niedermayer authored
    * commit '1b3439b3':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    67d501b4
Makefile 22.8 KB