ffmpeg/libavformat
Michael Niedermayer 944d049eaa 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>
2012-06-04 22:59:32 +02:00
..
2012-05-21 08:51:50 +02:00
2011-11-05 16:51:25 +01:00
2011-12-19 11:57:34 +01:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2012-05-10 04:17:03 +02:00
2011-12-30 20:00:53 +01:00
2012-05-31 23:50:08 +02:00
2011-08-09 19:56:25 +02:00
2012-05-07 02:42:00 +02:00
2012-05-20 16:29:08 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-05-26 00:18:15 +02:00
2012-05-21 08:51:50 +02:00
2012-03-31 12:37:42 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-05-08 10:37:13 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00