• Michael Niedermayer's avatar
    Merge commit 'a1bcc76e' · bec180e1
    Michael Niedermayer authored
    * commit 'a1bcc76e': (21 commits)
      cmdutils: fix a memleak when specifying an option twice.
      x86: mpegvideo: more sensible names for optimization file and init function
      x86: mpegvideoenc: Split optimizations off into a separate file
      dnxhdenc: x86: more sensible names for optimization file and init function
      svq1/svq3: Move common code out of SVQ1 decoder-specific file
      dirac: add Comments and references to the standard
      lavr: x86: optimized 6-channel flt to fltp conversion
      lavr: x86: optimized 2-channel flt to fltp conversion
      lavr: x86: optimized 6-channel flt to s16p conversion
      lavr: x86: optimized 2-channel flt to s16p conversion
      lavr: x86: optimized 6-channel s16 to fltp conversion
      lavr: x86: optimized 2-channel s16 to fltp conversion
      lavr: x86: optimized 6-channel s16 to s16p conversion
      lavr: x86: optimized 2-channel s16 to s16p conversion
      lavr: x86: optimized 2-channel fltp to flt conversion
      lavr: x86: optimized 6-channel fltp to s16 conversion
      lavr: x86: optimized 2-channel fltp to s16 conversion
      lavr: x86: optimized 6-channel s16p to flt conversion
      lavr: x86: optimized 2-channel s16p to flt conversion
      lavr: x86: optimized 6-channel s16p to s16 conversion
      ...
    
    Conflicts:
    	libavcodec/dirac.c
    	libavcodec/mpegvideo.h
    	libavcodec/x86/Makefile
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bec180e1
mpegvideo.c 26.6 KB