mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
c617bed34f
* 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> |
||
|---|---|---|
| .. | ||
| aviocat.c | ||
| bisect-create | ||
| build_libstagefright | ||
| clean-diff | ||
| cws2fws.c | ||
| enum_options.c | ||
| ffeval.c | ||
| graph2dot.c | ||
| ismindex.c | ||
| make_chlayout_test | ||
| missing_codec_desc | ||
| patcheck | ||
| pktdumper.c | ||
| probetest.c | ||
| qt-faststart.c | ||
| trasher.c | ||
| unwrap-diff | ||