• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9d7c1b4c
    Michael Niedermayer authored
    * qatar/master:
      h264: new assembly version of get_cabac for x86_64 with PIC
      h264: use one table instead of several for cabac functions
      h264: (trivial) remove unneeded macro argument in x86/cabac.h
      libschroedingerdec: check malloc
      segment: reorder seg_write_header allocation
      avio: make avio_close(NULL) a no-op
      mov: Parse EC3SpecificBox (dec3 atom).
    
    Conflicts:
    	libavcodec/cabac.c
    	libavcodec/x86/cabac.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9d7c1b4c
segment.c 7.91 KB