Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Sep 2012 10:53:44 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Sep 2012 10:53:44 +0000 (12:53 +0200)
* qatar/master:
  mov_chan: Only set the channel_layout if setting it to a nonzero value
  mov_chan: Reindent an incorrectly indented line
  mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
  x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
  x86: more specific checks for availability of required assembly capabilities
  x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
  fate: Drop redundant setting of FUZZ to 1
  cavsdsp: set idct permutation independently of dsputil
  x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov

Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
1  2 
libavcodec/cavsdec.c
libavcodec/cavsdsp.c
libavcodec/cavsdsp.h
libavcodec/x86/cavsdsp.c
libavcodec/x86/dnxhdenc.c
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_qns_template.c
libavcodec/x86/dsputil_rnd_template.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/lpc.c
libavcodec/x86/mpegaudiodec.c
libavformat/mov_chan.c
libavutil/x86/float_dsp.asm
libswscale/swscale.c
tests/fate/mpc.mak

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -3149,21 -3021,6 +3151,19 @@@ void ff_dsputil_init_mmx(DSPContext *c
                  c->idct_add              = ff_simple_idct_add_mmx;
                  c->idct                  = ff_simple_idct_mmx;
                  c->idct_permutation_type = FF_SIMPLE_IDCT_PERM;
-             } else if (idct_algo == FF_IDCT_CAVS) {
-                     c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
 +#if CONFIG_GPL
 +            } else if (idct_algo == FF_IDCT_LIBMPEG2MMX) {
 +                if (mm_flags & AV_CPU_FLAG_MMX2) {
 +                    c->idct_put = ff_libmpeg2mmx2_idct_put;
 +                    c->idct_add = ff_libmpeg2mmx2_idct_add;
 +                    c->idct     = ff_mmxext_idct;
 +                } else {
 +                    c->idct_put = ff_libmpeg2mmx_idct_put;
 +                    c->idct_add = ff_libmpeg2mmx_idct_add;
 +                    c->idct     = ff_mmx_idct;
 +                }
 +                c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM;
 +#endif
              } else if (idct_algo == FF_IDCT_XVIDMMX) {
                  if (mm_flags & AV_CPU_FLAG_SSE2) {
                      c->idct_put              = ff_idct_xvid_sse2_put;
Simple merge
Simple merge
Simple merge
  
  #include "libavutil/x86/asm.h"
  #include "libavutil/cpu.h"
 -#include "libavutil/internal.h"
  #include "libavcodec/lpc.h"
  
- #if HAVE_INLINE_ASM
+ #if HAVE_SSE2_INLINE
  
  static void lpc_apply_welch_window_sse2(const int32_t *data, int len,
                                          double *w_data)
@@@ -248,13 -244,11 +248,14 @@@ void ff_mpadsp_init_mmx(MPADSPContext *
      if (mm_flags & AV_CPU_FLAG_SSE2) {
          s->apply_window_float = apply_window_mp3;
      }
- #endif /* HAVE_INLINE_ASM */
+ #endif /* HAVE_SSE2_INLINE */
  #if HAVE_YASM
 -    if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) {
 +    if (0) {
 +#if HAVE_AVX_EXTERNAL
 +    } else if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) {
          s->imdct36_blocks_float = imdct36_blocks_avx;
 +#endif
  #if HAVE_SSE
      } else if (mm_flags & AV_CPU_FLAG_SSSE3) {
          s->imdct36_blocks_float = imdct36_blocks_ssse3;
@@@ -580,11 -579,11 +580,12 @@@ int ff_mov_read_chan(AVFormatContext *s
              label_mask |= mask_incr;
          }
      }
-     if (layout_tag == 0)
+     if (layout_tag == 0) {
+         if (label_mask)
              st->codec->channel_layout = label_mask;
-     else
+     else
          st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap);
 +    avio_skip(pb, size - 12);
  
      return 0;
  }
Simple merge
Simple merge
@@@ -8,7 -8,6 +8,6 @@@ FATE_MPC += fate-musepack
  fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
  fate-musepack7: CMP = oneoff
  fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm
- fate-musepack7: FUZZ = 1
  
 -FATE_SAMPLES_AVCONV += $(FATE_MPC)
 +FATE_SAMPLES_FFMPEG += $(FATE_MPC)
  fate-mpc: $(FATE_MPC)