• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c3b6cc61
    Michael Niedermayer authored
    * qatar/master:
      ffserver: remove unused variable.
      Remove unused and outdated TODO file.
      gitignore: Drop individual .d ignore; it is already covered by a wildcard.
      lavf: deprecate AVStream.quality.
      bink: pass Bink version to audio decoder through extradata instead of codec_tag.
      libpostproc: Remove disabled code.
      flashsv: improve some comments and fix some wrong ones
      flashsv: Eliminate redundant variable indirection.
      flashsv: set reference frame type to full frame
      flashsv: replace bitstream description by a link to the specification
      flashsv: convert a debug av_log into av_dlog
      flashsv: simplify condition
      flashsv: return more meaningful error values
      flashsv: cosmetics: break some overly long lines
      flashsv: cosmetics: drop some unnecessary parentheses
      swscale: amend documentation to mention use of native depth for scaling.
      eval: add missing comma to tests.
      eval: fix memleak.
      H.264: make loopfilter bS const where applicable
    
    Conflicts:
    	libavcodec/binkaudio.c
    	libavformat/bink.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c3b6cc61
Name
Last commit
Last update
..
acodec Loading commit data...
fate Loading commit data...
lavf Loading commit data...
lavfi Loading commit data...
seek Loading commit data...
vsynth1 Loading commit data...
vsynth2 Loading commit data...