• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6a56f4e6
    Michael Niedermayer authored
    * qatar/master:
      flicvideo: fix invalid reads
      vorbis: Avoid some out-of-bounds reads
      vqf: add more known extensions
      cabac: remove unused function renorm_cabac_decoder
      h264: Only use symbols from the SVQ3 decoder under proper conditionals.
      add bytestream2_tell() and bytestream2_seek() functions
      parsers: initialize MpegEncContext.slice_context_count to 1
      spdifenc: use special alignment for DTS-HD length_code
    
    Conflicts:
    	libavcodec/flicvideo.c
    	libavcodec/h264.c
    	libavcodec/mpeg4video_parser.c
    	libavcodec/vorbis.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6a56f4e6
h264_parser.c 12.4 KB