• 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
..
asv1 Loading commit data...
asv2 Loading commit data...
dnxhd_1080i Loading commit data...
dnxhd_720p Loading commit data...
dnxhd_720p_10bit Loading commit data...
dnxhd_720p_rd Loading commit data...
dv Loading commit data...
dv50 Loading commit data...
error Loading commit data...
ffv1 Loading commit data...
flashsv Loading commit data...
flashsv2 Loading commit data...
flv Loading commit data...
h261 Loading commit data...
h263 Loading commit data...
h263p Loading commit data...
huffyuv Loading commit data...
jpegls Loading commit data...
ljpeg Loading commit data...
mjpeg Loading commit data...
mpeg Loading commit data...
mpeg1b Loading commit data...
mpeg2 Loading commit data...
mpeg2thread Loading commit data...
mpeg4 Loading commit data...
mpeg4adv Loading commit data...
mpeg4nr Loading commit data...
mpeg4thread Loading commit data...
msmpeg4 Loading commit data...
msmpeg4v2 Loading commit data...
msvideo1 Loading commit data...
qtrle Loading commit data...
qtrlegray Loading commit data...
rc Loading commit data...
rgb Loading commit data...
roq Loading commit data...
rv10 Loading commit data...
rv20 Loading commit data...
snow Loading commit data...
snowll Loading commit data...
svq1 Loading commit data...
vref Loading commit data...
wmv1 Loading commit data...
wmv2 Loading commit data...
yuv Loading commit data...