Michael Niedermayer e366e6bfab Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  ppc: drop unused function dct_quantize_altivec()
  mpegaudiodec: Do not discard mp_decode_frame() return value.
  matroska: do not set invalid default duration if frame rate is zero
  mkv: use av_reduce instead of av_d2q for framerate estimation
  mkv: report average framerate as minimal as well
  avcodec_string: Favor AVCodecContext.codec over the default codec.
  cook: Make constants passed to AV_BE2NE32C() unsigned to avoid signed overflow.

Conflicts:
	libavcodec/cook.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/utils.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-04-18 22:08:28 +02:00

..

asm.S

…

dsputil_altivec.c

…

dsputil_altivec.h

…

dsputil_ppc.c

…

fdct_altivec.c

…

fft_altivec_s.S

…

fft_altivec.c

…

float_altivec.c

…

fmtconvert_altivec.c

…

gmc_altivec.c

…

h264_altivec.c

…

h264_template_altivec.c

…

idct_altivec.c

…

int_altivec.c

…

Makefile

build: Consistently handle conditional compilation for all optimization OBJS.

2012-04-12 09:00:49 +02:00

mathops.h

…

mpegaudiodec_altivec.c

…

mpegvideo_altivec.c

Merge remote-tracking branch 'qatar/master'

2012-04-18 22:08:28 +02:00

regs.h

…

types_altivec.h

…

util_altivec.h

…

vc1dsp_altivec.c

…

vp3dsp_altivec.c

…

vp8dsp_altivec.c

…