• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a7758884
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a7758884
ratecontrol.c 32.5 KB