1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
Michael Niedermayer b27c7d70d8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mss1: fix decoding masked regions in interframes
  mxfdec: fix off by one error.
  mxfdec: only parse next partition pack if parsing forward
  mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
  mxfdec: fix frame height vs field height confusion
  mxfdec: Add intra_only flag to MXFTrack
  mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
  mxfdec: truncate packets that extend past the next edit unit
  mxfdec: set pixel format for cdci picture formats
  mxfdec: detect uncomp pictures using essence container ul
  mxfdec: set track edit rate num/den in expected order
  x86/cpu: implement get/set_eflags using intrinsics
  x86/cpu: implement support for cpuid through intrinsics
  x86/cpu: implement support for xgetbv through intrinsics
  lavu: use intrinsics for emms on systems lacking inline asm support
  mem: Don't abort on av_malloc(0) in debug mode

Conflicts:
	configure
	libavformat/mxf.h
	libavformat/mxfdec.c

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