Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Sep 2011 22:54:59 +0000 (00:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Sep 2011 23:03:07 +0000 (01:03 +0200)
commita7758884db7eb3041b73d673c1ac3897609556b9
treefbf882650e3d0607bd189ae571e402b55179f078
parentf7e797aa5c987c39b55666a2d41877ef2aec40bc
parent0c378ea1f76e226eff460c84634e7227e3705372
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>
avconv.c
libavcodec/proresdec_lgpl.c
libavcodec/ratecontrol.c
libavformat/flvdec.c
libavformat/rtp.c
libavformat/rtpenc.c
libavformat/sdp.c
libavformat/utils.c
libswscale/swscale.c
tests/ref/lavfi/pixfmts_scale