FFmpeg/libavformat
Michael Niedermayer 92ef4be4ab Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/libopenjpegdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-22 22:26:42 +02:00
..
2012-04-16 15:27:39 +02:00
2012-04-19 22:52:34 +02:00
2012-04-04 20:39:33 +02:00
2012-03-03 04:30:49 +01:00
2011-12-30 20:00:53 +01:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-03-31 12:37:42 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-04-06 00:53:09 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-04-04 20:39:33 +02:00
2012-02-28 07:20:36 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00