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-02-02 18:50:42 +00:00
2012-04-22 22:26:42 +02:00
2011-07-06 00:29:59 +01:00
2011-10-24 01:01:21 +02:00
2012-01-14 02:22:09 +01:00
2011-12-15 01:02:58 +00:00
2012-04-22 22:26:42 +02:00
2012-03-13 01:56:33 +01:00
2011-11-24 03:32:24 +01:00
2012-04-22 22:26:42 +02:00
2012-04-22 22:26:42 +02:00
2012-04-22 22:26:42 +02:00
2012-04-22 22:26:42 +02:00
2012-04-22 22:26:42 +02:00
2011-12-02 00:51:11 +01:00
2012-04-22 22:26:42 +02:00
2011-07-06 01:34:08 +02:00
2012-04-22 22:26:42 +02:00
2011-11-24 03:32:24 +01:00
2012-04-22 22:26:42 +02:00
2011-11-24 03:32:24 +01:00
2011-12-06 13:48:25 +00:00
2012-04-22 22:26:42 +02:00
2011-12-07 02:04:00 +01:00
2011-11-24 03:32:24 +01:00
2012-04-22 22:26:42 +02:00
2011-07-11 04:23:25 +02:00
2012-03-08 02:51:45 +01:00
2012-04-13 00:39:19 +02:00
2011-11-24 03:32:24 +01:00
2012-04-22 12:30:45 +01:00
2012-04-22 22:26:42 +02:00
2012-03-13 01:56:33 +01:00
2012-02-16 01:34:37 +01:00
2011-12-02 19:59:18 +00:00
2012-02-20 14:58:25 -08:00
2012-01-16 19:26:41 +01:00
2012-04-10 10:06:48 -07:00
2011-12-16 14:36:01 +00:00
2012-04-22 12:30:45 +01:00
2012-01-28 14:56:18 +00:00
2012-01-14 02:22:09 +01:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2012-02-07 01:40:29 +01:00
2012-02-10 01:20:07 +01:00
2011-10-03 01:49:36 +02:00
2012-04-22 22:26:42 +02:00
2012-02-07 01:40:29 +01:00
2012-04-22 22:26:42 +02:00
92ef4be4ab