ffmpeg/libavcodec
Michael Niedermayer 3e1a7ae44a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swfdec: Add support for sample_rate_code 0 (5512 Hz)
  dct-test: factor out some common code and do whas was likely intended
  doc: library versions need to be bumped in version.h
  Revert "ffmpeg: get rid of useless AVInputStream.nb_streams."
  Remove some forgotten AVCodecContext.palctrl usage.
  lavc/utils: move avcodec_init() higher in the file.
  lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
  ac3dec: actually use drc_scale private option
  lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros
  alsa: add missing header
  msmpeg4: remove leftover unused debug variable declaration
  Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
  Fix av_dlog invocations with wrong or missing logging context.
  vf_yadif: add support to yuva420p
  vf_yadif: correct documentation on the parity parameter
  vf_yadif: copy buffer properties like aspect for second frame as well
  oma: support for encrypted files
  id3v2: add support for non-text and GEOB type tag frames
  des: add possibility to calculate DES-CBC-MAC with small buffer

Conflicts:
	ffmpeg.c
	libavcodec/dct-test.c
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-21 21:25:43 +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-09-19 21:52:06 +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-09-15 13:23:04 -07:00
2011-09-16 05:53:32 +02:00
2011-09-16 05:53:14 +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-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +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-30 05:41:44 +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-09-08 05:34:17 +02:00
2011-09-15 13:23:04 -07:00
2011-09-11 04:07:08 +02:00
2011-05-11 05:47:02 +02:00
2011-09-16 05:53:14 +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-09-07 01:10:14 +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-09-17 21:55:11 +02:00
2011-09-20 10:29:55 +03:00
2011-09-17 21:55:11 +02:00
2011-09-14 11:13:54 +03:00
2011-03-28 00:16:44 +02:00
2011-09-17 21:55:11 +02:00
2011-09-07 01:10:14 +02:00
2011-09-15 13:23:04 -07:00
2011-09-07 12:16:15 +02:00
2011-09-11 12:54:47 +02:00
2011-09-01 02:38:56 +02:00
2011-09-18 15:33:50 +02:00
2011-05-13 04:40:40 +02:00
2011-09-10 22:10:00 +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