ffmpeg/libavcodec
Michael Niedermayer ba57ef2972 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: Fix spelling errors.
  aac: Only set sample rate and object type from ADTS if output hasn't been configured.
  aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
  aac: Only output configure if audio was found.
  avconv: save two levels of indentation in flush_encoders()
  avconv: factor flushing encoders out of output_packet().
  avconv: factor out initializing input streams.
  avconv: remove -intra option.
  avconv: reset streamid_map between output files.
  avconv: make timer_start a local var in transcode().
  avconv: cosmetics, move OutputStream.
  avconv: remove two unused macros.

Conflicts:
	avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-19 00:53:42 +02:00
..
2011-08-15 06:14:40 +02:00
2011-08-15 00:39:55 +02:00
2011-06-02 20:06:00 +01:00
2011-04-28 04:26:01 +02:00
2011-04-17 23:43:54 +02:00
2011-08-12 17:20:57 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-21 02:31:27 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-06-02 20:06:00 +01:00
2011-04-26 22:06:13 +02:00
2011-08-15 00:39:55 +02:00
2011-04-27 03:51:04 +02:00
2011-04-29 18:31:17 +02:00
2011-04-25 00:20:03 +02:00
2011-04-25 00:20:03 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-05-11 05:47:02 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-04-27 03:51:04 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-07-21 18:10:58 +01:00
2011-05-11 05:47:02 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-05-08 01:33:40 +02:00
2011-05-11 05:47:02 +02:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-04-03 16:40:12 +02:00
2011-08-15 00:39:55 +02:00
2011-03-28 00:16:44 +02:00
2011-08-16 23:07:25 +02:00
2011-05-05 03:30:24 +02:00
2011-08-16 23:07:25 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-13 04:40:40 +02:00
2011-08-15 00:39:55 +02:00
2011-04-27 03:51:04 +02:00
2011-06-21 13:17:10 +02:00
2011-04-20 04:48:23 +02:00