• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b4bcd1e2
    Michael Niedermayer authored
    * qatar/master:
      Fix compilation of iirfilter-test.
      libx264: handle closed GOP codec flag
      lavf: remove duplicate assignment in avformat_alloc_context.
      lavf: use designated initializers for AVClasses.
      flvdec: clenup debug code
      asfdec: fix possible overread on broken files.
      asfdec: do not fall back to binary/generic search
      asfdec: reindent after previous commit c7bd5eda
      asfdec: fallback to binary search internally
      mpegaudio: add _fixed suffix to some names
      Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
      dct: build dct32 as separate object files
      qdm2: include correct header for rdft
    
    Conflicts:
    	ffpresets/libx264-fast.ffpreset
    	ffpresets/libx264-fast_firstpass.ffpreset
    	ffpresets/libx264-faster.ffpreset
    	ffpresets/libx264-faster_firstpass.ffpreset
    	ffpresets/libx264-medium.ffpreset
    	ffpresets/libx264-medium_firstpass.ffpreset
    	ffpresets/libx264-placebo.ffpreset
    	ffpresets/libx264-placebo_firstpass.ffpreset
    	ffpresets/libx264-slow.ffpreset
    	ffpresets/libx264-slow_firstpass.ffpreset
    	ffpresets/libx264-slower.ffpreset
    	ffpresets/libx264-slower_firstpass.ffpreset
    	ffpresets/libx264-superfast.ffpreset
    	ffpresets/libx264-superfast_firstpass.ffpreset
    	ffpresets/libx264-ultrafast.ffpreset
    	ffpresets/libx264-ultrafast_firstpass.ffpreset
    	ffpresets/libx264-veryfast.ffpreset
    	ffpresets/libx264-veryfast_firstpass.ffpreset
    	ffpresets/libx264-veryslow.ffpreset
    	ffpresets/libx264-veryslow_firstpass.ffpreset
    	libavformat/flvdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b4bcd1e2
mpegaudio_tablegen.c 1.42 KB