• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e3822886
    Michael Niedermayer authored
    * qatar/master:
      avcodec_default_reget_buffer(): fix compilation in DEBUG mode
      fate: Overhaul WavPack coverage
      h264: fix mmxext chroma deblock to use correct TC values.
      flvdec: Remove the now redundant check for known broken metadata creator
      flvdec: Validate index entries added from metadata while reading
      rtsp: Handle requests from server to client
      movenc: use timestamps instead of frame_size for samples-per-packet
      movenc: use the first cluster duration as the tfhd default duration
      movenc: factorize calculation of cluster duration into a separate function
      doc/APIchanges: fill in missing dates and hashes.
      lavc: reorder AVCodecContext fields.
      lavc: reorder AVFrame fields.
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/avcodec.h
    	libavformat/flvdec.c
    	libavformat/movenc.c
    	tests/fate/lossless-audio.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e3822886
flvdec.c 26.7 KB