-
- Downloads
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>
No related branches found
No related tags found
Showing
- Changelog 1 addition, 0 deletionsChangelog
- configure 26 additions, 5 deletionsconfigure
- doc/general.texi 2 additions, 0 deletionsdoc/general.texi
- libavcodec/Makefile 1 addition, 0 deletionslibavcodec/Makefile
- libavcodec/allcodecs.c 1 addition, 0 deletionslibavcodec/allcodecs.c
- libavcodec/avcodec.h 1 addition, 0 deletionslibavcodec/avcodec.h
- libavcodec/codec_desc.c 7 additions, 0 deletionslibavcodec/codec_desc.c
- libavcodec/dct-test.c 2 additions, 2 deletionslibavcodec/dct-test.c
- libavcodec/h263dec.c 5 additions, 1 deletionlibavcodec/h263dec.c
- libavcodec/imgconvert.c 4 additions, 4 deletionslibavcodec/imgconvert.c
- libavcodec/mpegvideo.c 8 additions, 5 deletionslibavcodec/mpegvideo.c
- libavcodec/mss1.c 45 additions, 66 deletionslibavcodec/mss1.c
- libavcodec/mss12.c 252 additions, 130 deletionslibavcodec/mss12.c
- libavcodec/mss12.h 62 additions, 8 deletionslibavcodec/mss12.h
- libavcodec/mss2.c 864 additions, 0 deletionslibavcodec/mss2.c
- libavcodec/mss2dsp.c 153 additions, 0 deletionslibavcodec/mss2dsp.c
- libavcodec/mss2dsp.h 50 additions, 0 deletionslibavcodec/mss2dsp.h
- libavcodec/vc1.c 8 additions, 1 deletionlibavcodec/vc1.c
- libavcodec/vc1.h 2 additions, 0 deletionslibavcodec/vc1.h
- libavcodec/vc1dec.c 7 additions, 3 deletionslibavcodec/vc1dec.c
Loading
Please register or sign in to comment