• 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
Name
Last commit
Last update
..
bfin Loading commit data...
mlib Loading commit data...
ppc Loading commit data...
sparc Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
colorspace-test.c Loading commit data...
libswscale.v Loading commit data...
options.c Loading commit data...
rgb2rgb.c Loading commit data...
rgb2rgb.h Loading commit data...
rgb2rgb_template.c Loading commit data...
swscale-test.c Loading commit data...
swscale.c Loading commit data...
swscale.h Loading commit data...
swscale_internal.h Loading commit data...
swscale_unscaled.c Loading commit data...
utils.c Loading commit data...
yuv2rgb.c Loading commit data...