1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer ec7946853a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtpdec_jpeg: Add support for default quantizers
  x86: dsputil: Move specific optimization settings out of global init function
  avplay: get rid of ugly casts in the options table
  avplay: fix prototypes for option callbacks.
  flvdec: always set AVFMTCTX_NOHEADER.
  file: Use a normal private context for storing the file descriptor
  configure: Adjust the xgetbv instrinsic check
  configure: Add --disable-inline-asm command line option
  configure: Don't try to enable the log2 function on msvcrt

Conflicts:
	configure
	ffplay.c
	libavcodec/x86/dsputil_mmx.c
	libavformat/file.c
	libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11 15:24:22 +02:00
..
2012-08-30 05:17:24 +02:00
2012-08-14 16:54:25 +02:00
2012-08-18 17:45:58 +02:00
2012-09-08 02:28:20 +02:00
2012-08-07 23:57:21 +02:00
2012-08-31 23:27:27 +02:00
2012-08-18 05:02:58 +02:00
2012-08-21 01:52:55 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-08-14 16:54:25 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-09-10 17:08:18 +02:00
2012-08-27 05:23:42 +02:00
2012-09-10 20:57:23 +02:00
2012-08-26 22:15:20 +02:00
2012-08-26 22:15:21 +02:00
2012-07-20 11:16:52 +02:00
2012-09-06 04:42:43 +02:00
2012-09-01 23:45:32 +02:00
2012-08-07 23:57:21 +02:00
2012-09-03 22:40:41 +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