• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6968a7d1
    Michael Niedermayer authored
    * qatar/master:
      doc/general: update supported devices table.
      doc/general: add missing @tab to codecs table.
      h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
      avconv: reindent
      avconv: link '-passlogfile' option to libx264 'stats' AVOption.
      libx264: add 'stats' private option for setting 2pass stats filename.
      libx264: fix help text for slice-max-size option.
      http: Clear the auth state on redirects
      http: Retry auth if it failed due to being stale
      rtsp: Resend new keepalive commands if they used stale auth
      rtsp: Retry authentication if failed due to being stale
      httpauth: Parse the stale field in digest auth
      dxva2_vc1: pass the overlap flag to the decoder
      dxva2_vc1: fix decoding of BI frames
      FATE: add shorthand to wavpack test
      dfa: convert to bytestream2 API
      anm decoder: move buffer allocation from decode_init() to decode_frame()
      h264: improve parsing of broken AVC SPS
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/anm.c
    	libavcodec/dfa.c
    	libavcodec/h264.c
    	libavcodec/h264_direct.c
    	libavcodec/h264_ps.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6968a7d1
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...