• 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
rtspdec.c 13.3 KB