1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer c617bed34f 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>
2012-08-31 13:34:32 +02:00
..
2012-08-30 05:17:24 +02:00
2012-08-28 03:18:21 +02:00
2012-08-14 16:54:25 +02:00
2012-08-14 03:21:08 +02:00
2012-08-18 17:45:58 +02:00
2012-08-29 00:05:03 +02:00
2012-08-07 23:57:21 +02:00
2012-08-16 04:25:07 +02:00
2012-08-18 05:02:58 +02:00
2012-08-21 01:52:55 +02:00
2012-08-14 16:54:25 +02:00
2012-08-10 16:26:39 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-08-30 00:22:58 +02:00
2012-08-27 19:06:32 +02:00
2012-08-30 17:56:38 +02:00
2012-08-27 05:23:42 +02:00
2012-08-26 22:15:20 +02:00
2012-08-26 22:15:21 +02:00
2012-08-07 23:57:21 +02:00
2012-08-28 22:29:20 +02:00
2012-07-25 20:31:16 +03:00
2012-08-29 00:28:07 +02:00
2012-08-29 00:05:03 +02:00
2012-08-07 23:57:21 +02:00