Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Jun 2012 20:54:15 +0000 (22:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Jun 2012 20:59:32 +0000 (22:59 +0200)
commit944d049eaa1ca829d97c2877ec9524c049148e14
tree472292bb64fb4b786c5c2bd22835f9bdb0f227b5
parentdf03ae8dd80b28e0461611709e290bc61db3cdca
parent41e9682af22336bd08a5906629731c0c32aa00c6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Write chan atom for all audio tracks in mov mode movies.
  mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
  doc/avconv: add some details about the transcoding process.
  avidec: make scale and rate unsigned.
  avconv: check output stream recording time before each frame returned from filters
  avconv: split selecting input file out of transcode().
  avconv: split checking for active outputs out of transcode().
  avfiltergraph: make some functions static.

Conflicts:
ffmpeg.c
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavformat/mpegtsenc.c
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
doc/ffmpeg.texi
ffmpeg.c
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavformat/avidec.c
libavformat/movenc.c
libavformat/mpegtsenc.c
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/lavf/mov