1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer b5da7d4c1a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avformat: Drop pointless "format" from container long names
  swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
  wv: K&R formatting cosmetics
  configure: Add missing descriptions to help output
  h264_ps: declare array of colorspace strings on its own line.
  fate: amix: specify f32 sample format for comparison
  tiny_psnr: support 32-bit float samples
  eamad/eatgq/eatqi: call special EA IDCT directly
  eamad: remove use of MpegEncContext
  mpegvideo: remove unnecessary inclusions of faandct.h
  af_asyncts: avoid overflow in out_size with large delta values
  af_asyncts: add first_pts option

Conflicts:
	configure
	libavcodec/eamad.c
	libavcodec/h264_ps.c
	libavformat/crcenc.c
	libavformat/ffmdec.c
	libavformat/ffmenc.c
	libavformat/framecrcenc.c
	libavformat/md5enc.c
	libavformat/nutdec.c
	libavformat/rawenc.c
	libavformat/yuv4mpeg.c
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30 23:28:31 +02:00
..
2012-07-29 01:28:12 +00:00
2012-06-09 10:57:14 +00:00
2012-07-30 02:45:21 +00:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-07-23 21:46:28 +00:00
2012-07-10 13:27:16 +02:00
2012-07-03 09:53:42 +00:00
2012-07-29 01:28:12 +00:00
2012-07-20 11:19:01 +02:00
2012-06-11 07:35:14 +02:00
2012-06-13 18:51:38 +02:00
2012-07-12 23:16:52 +02:00
2012-07-05 04:23:55 +02:00
2012-07-20 11:16:52 +02:00
2012-07-20 11:16:52 +02:00
2012-07-08 20:49:04 +00:00
2012-07-29 08:06:30 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-07-25 20:31:16 +03:00
2012-07-08 20:49:35 +00:00
2012-07-26 22:22:54 +02:00
2012-06-07 21:30:07 +02:00
2012-06-25 16:20:08 +03:00
2012-07-06 17:08:22 +02:00
2012-07-29 01:28:12 +00:00
2012-07-06 17:08:22 +02:00