• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · aedc9086
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    aedc9086
Name
Last commit
Last update
..
bswap.h Loading commit data...
cpu.c Loading commit data...
intmath.h Loading commit data...
intreadwrite.h Loading commit data...
timer.h Loading commit data...
x86inc.asm Loading commit data...
x86util.asm Loading commit data...