Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Aug 2012 11:18:48 +0000 (13:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Aug 2012 11:34:32 +0000 (13:34 +0200)
commitc617bed34f39a122ab1f89581ddce9cc63885383
treeed2c0bd467f5f5c912ac46a2b95457a5647ced75
parent98298eb1034bddb4557fa689553dae793c2b0092
parentede3d6400d7c06863e6eb4bcff5f676480ae6b5e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  MSS1 and MSS2: set final pixel format after common stuff has been initialised
  MSS2 decoder
  configure: handle --disable-asm before check_deps
  x86: Split inline and external assembly #ifdefs
  configure: x86: Separate inline from standalone assembler capabilities
  pktdumper: Use a custom define instead of PATH_MAX for buffers
  pktdumper: Use av_strlcpy instead of strncpy
  pktdumper: Use sizeof(variable) instead of the direct buffer length

Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dct-test.c
libavcodec/imgconvert.c
libavcodec/mss12.c
libavcodec/version.h
libavfilter/x86/gradfun.c
libswscale/x86/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
42 files changed:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dct-test.c
libavcodec/h263dec.c
libavcodec/imgconvert.c
libavcodec/mpegvideo.c
libavcodec/mss1.c
libavcodec/mss12.c
libavcodec/mss12.h
libavcodec/mss2.c
libavcodec/mss2dsp.c
libavcodec/mss2dsp.h
libavcodec/vc1.c
libavcodec/vc1.h
libavcodec/vc1dec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32.asm
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fft.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_qpel.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegvideoenc.c
libavfilter/x86/gradfun.c
libavfilter/x86/yadif.c
libavformat/riff.c
libavutil/internal.h
libavutil/x86/float_dsp.asm
libswscale/swscale.c
libswscale/utils.c
libswscale/x86/swscale.c
libswscale/x86/yuv2rgb.c
tools/pktdumper.c