ffmpeg/libavformat
Michael Niedermayer c047afb80c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: remove AVCodecContext.dsp_mask
  avconv: fix a segfault when default encoder for a format doesn't exist.
  utvideo: general cosmetics
  aac: Handle HE-AACv2 when sniffing a channel order.
  movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
  xxan: Remove write-only variable in xan_decode_frame_type0().
  ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().

Conflicts:
	ffmpeg.c
	libavcodec/utvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-21 22:56:07 +02:00
..
2012-04-16 15:27:39 +02:00
2011-11-05 16:51:25 +01:00
2012-04-19 22:52:34 +02:00
2011-12-19 11:57:34 +01:00
2012-04-04 20:39:33 +02:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-03-31 12:37:42 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-04-06 00:53:09 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-04-04 20:39:33 +02: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-01-16 11:29:55 +01:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00