• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5864ce13
    Michael Niedermayer authored
    * qatar/master:
      mp3dec: read Xing frame TOC index
      mp3dec: use named constants for Xing header flags
      libx264: add support for nal-hrd, required for Blu-ray streams.
      mov: support random access point grouping
      matroskadec: properly support BlockDuration
    
    Conflicts:
    	libavcodec/libx264.c
    	libavformat/isom.h
    	libavformat/matroskadec.c
    	libavformat/mov.c
    	libavformat/mp3dec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5864ce13
mov.c 112 KB