1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
FFmpeg/libavcodec
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-03-20 18:46:56 -04:00
2012-03-27 11:58:15 -04:00
2012-02-20 15:08:41 -05:00
2012-03-21 03:03:33 +01:00
2012-04-21 19:28:35 +02:00
2012-04-17 19:36:15 +02:00
2012-04-16 16:27:34 +02:00
2012-04-18 16:49:46 +02:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-03-13 01:14:04 +01:00
2012-04-06 22:37:38 +03:00
2012-04-15 16:06:51 +02:00
2012-04-09 20:55:09 +02:00
2012-03-02 18:58:19 +02:00
2012-02-20 15:08:41 -05:00
2012-04-22 17:27:54 +02:00
2012-04-15 13:26:19 +02:00
2012-03-30 20:10:39 +02:00
2012-04-21 18:56:19 +01:00
2012-03-22 13:23:08 +01:00
2012-03-24 23:35:09 +01:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-15 01:08:13 +02:00
2012-04-12 11:36:17 +02:00
2012-04-06 22:37:38 +03:00
2012-03-19 18:46:34 +01:00
2012-04-06 00:53:09 +02:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-03-24 17:48:03 +01:00
2012-04-16 18:36:40 +02:00
2012-04-15 20:20:43 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-04-10 23:37:30 +02:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-04-21 18:56:19 +01:00
2012-04-15 16:06:52 +02:00
2012-03-27 20:08:41 +02:00
2012-03-18 07:45:41 -07:00