FFmpeg/libavcodec
Michael Niedermayer a7758884db Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtp: factorize  dynamic payload type fallback
  flvdec: Ignore the index if it's from a creator known to be different
  cmdutils: move grow_array out of #if CONFIG_AVFILTER
  avconv: actually set InputFile.rate_emu
  ratecontrol: update last_qscale_for sooner
  Fix unnecessary shift with 9/10bit vertical scaling
  prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
  prores: return more meaningful error values
  prores: improve error message wording
  prores: cosmetics: prettyprinting, drop useless parentheses
  prores: lowercase AVCodec name entry

Conflicts:
	cmdutils.c
	libavcodec/proresdec_lgpl.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 01:03:07 +02:00
..
2011-08-15 00:39:55 +02:00
2011-09-23 22:41:10 +02:00
2011-08-12 17:20:57 +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-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-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-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +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-09-07 01:10:14 +02:00
2011-09-23 01:12:29 +02:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-09-17 21:55:11 +02:00
2011-09-22 10:35:06 +03:00
2011-09-17 21:55:11 +02:00
2011-09-14 11:13:54 +03:00
2011-09-17 21:55:11 +02:00
2011-09-07 01:10:14 +02:00
2011-09-23 23:39:51 +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-10 22:10:00 +02:00
2011-08-15 00:39:55 +02:00