virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
82a1d57575
FFmpeg/libavcodec/ppc
History
Michael Niedermayer aedc908601 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  flvdec: Do not call parse_keyframes_index with a NULL stream
  libspeexdec: include system headers before local headers
  libspeexdec: return meaningful error codes
  libspeexdec: cosmetics: reindent
  libspeexdec: decode one frame at a time.
  swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()
  Move timefilter code from lavf to lavd.
  mov: add support for hdvd and pgapmetadata atoms
  mov: rename function _stik, some indentation cosmetics
  mov: rename function _int8 to remove ambiguity, some indentation cosmetics
  mov: parse the gnre atom
  mp3on4: check for allocation failures in decode_init_mp3on4()
  mp3on4: create a separate flush function for MP3onMP4.
  mp3on4: ensure that the frame channel count does not exceed the codec channel count.
  mp3on4: set channel layout
  mp3on4: fix the output channel order
  mp3on4: allocate temp buffer with av_malloc() instead of on the stack.
  mp3on4: copy MPADSPContext from first context to all contexts.
  fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm
  fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm
  ...

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_ps.c
	libavcodec/h264dsp_template.c
	libavcodec/h264idct_template.c
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavcodec/x86/h264dsp_mmx.c
	libavdevice/Makefile
	libavdevice/jack_audio.c
	libavformat/Makefile
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavutil/pixfmt.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-22 01:16:41 +02:00
..
asm.S Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
dsputil_altivec.c
dsputil_altivec.h
dsputil_ppc.c ppc: fix usage of dsp_mask 2011-09-30 02:43:20 +02:00
fdct_altivec.c
fft_altivec_s.S Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
fft_altivec.c
float_altivec.c
fmtconvert_altivec.c
gmc_altivec.c
h264_altivec.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
h264_template_altivec.c
idct_altivec.c
int_altivec.c
Makefile
mathops.h
mpegaudiodec_altivec.c
mpegvideo_altivec.c mpegvideo: support encoding with chroma intra tables that differ from luma. 2011-09-25 12:29:20 +02:00
regs.h
types_altivec.h
util_altivec.h
vc1dsp_altivec.c
vp3dsp_altivec.c
vp8dsp_altivec.c