OSDN Git Service

Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Sep 2012 12:53:53 +0000 (14:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Sep 2012 13:13:53 +0000 (15:13 +0200)
commit67d501b4f1758ba0783b14da4a6b3abd506792fa
treed9160dbe01eead7675731eaecfcabb24616fa79d
parentb90210e9c5ea365befef61b10b9a34ce37f9e679
parent1b3439b3055b083df51d7f7838ecc6b3f708b15c
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>
configure
libavcodec/binkaudio.c
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/Makefile
libavformat/mov.c
libavformat/smoothstreamingenc.c