Michael Niedermayer
78accb876c
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
ffmpeg: fix some indentation
ffmpeg: fix operation with --disable-avfilter
simple_idct: remove disabled code
motion_est: remove disabled code
vc1: remove disabled code
fate: separate lavf-mxf_d10 test from lavf-mxf
cabac: Move code only used in the cabac test program to cabac.c.
ffplay: warn that -pix_fmt is no longer working, suggest alternative
ffplay: warn that -s is no longer working, suggest alternative
lavf: rename enc variable in utils.c:has_codec_parameters()
lavf: use designated initialisers for all (de)muxers.
wav: remove a use of deprecated AV_METADATA_ macro
rmdec: remove useless ap parameter from rm_read_header_old()
dct-test: remove write-only variable
des: fix #if conditional around P_shuffle
Use LOCAL_ALIGNED in ff_check_alignment()
Conflicts:
ffmpeg.c
libavformat/avidec.c
libavformat/matroskaenc.c
libavformat/mp3enc.c
libavformat/oggenc.c
libavformat/utils.c
tests/ref/lavf/mxf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17 20:12:02 +02:00
2011-07-16 19:43:35 +02:00
2011-07-16 19:43:35 +02:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-06-02 20:06:00 +01:00
2011-06-08 05:25:28 +02:00
2011-07-03 03:14:10 +02:00
2011-06-30 04:32:24 +02:00
2011-07-13 10:39:06 -07:00
2011-06-30 04:32:24 +02:00
2011-07-01 05:35:26 +02:00
2011-07-16 19:43:35 +02:00
2011-06-30 04:32:24 +02:00
2011-07-03 03:14:10 +02:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2011-07-02 03:24:32 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-13 16:49:35 -04:00
2011-07-13 16:55:28 -04:00
2011-07-14 02:24:10 +02:00
2011-07-14 02:24:10 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-07-16 19:43:35 +02:00
2011-05-29 03:34:35 +02:00
2011-06-21 03:38:25 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-07-12 01:42:32 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-06 23:57:11 +02:00
2011-07-10 17:56:06 +01:00
2011-07-03 03:14:10 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-15 17:51:09 +02:00
2011-06-02 20:06:00 +01:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-06-21 21:03:46 -07:00
2011-07-05 02:26:17 +02:00
2011-06-18 11:36:35 +02:00
2011-07-17 20:12:02 +02:00
2011-06-03 05:19:30 +02:00
2011-07-09 02:06:40 +02:00
2011-06-26 14:09:48 -07:00
2011-07-13 00:42:11 +02:00
2011-06-08 05:25:28 +02:00
2011-07-06 01:34:08 +02:00
2011-07-17 20:12:02 +02:00
2011-07-11 04:23:25 +02:00
2011-07-05 18:46:23 +02:00
2011-06-08 05:25:28 +02:00
2011-07-16 12:38:20 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-09 17:21:31 +02:00
2011-07-15 00:26:23 +03:00
2011-06-07 15:16:41 -04:00
2011-07-15 17:51:09 +02:00
2011-07-12 01:42:32 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-27 03:32:45 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-07-15 17:51:09 +02:00
2011-06-19 03:54:15 +02:00
2011-07-16 19:43:35 +02:00
2011-07-16 19:43:35 +02:00
2011-07-04 00:45:21 +02:00
2011-07-15 17:51:09 +02:00
2011-06-24 03:07:04 +02:00
2011-07-02 03:24:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 20:44:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-23 04:49:04 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 20:44:58 +02:00
2011-07-06 01:34:08 +02:00
2011-06-15 02:15:25 +02:00
2011-07-06 01:34:08 +02:00
2011-07-06 01:34:08 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-05 02:26:17 +02:00
2011-05-28 18:25:40 +02:00
2011-06-03 05:19:30 +02:00
2011-06-10 04:47:23 +02:00
2011-07-11 04:23:25 +02:00
2011-06-03 05:19:30 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-06-08 16:38:37 +02:00
2011-06-24 03:07:04 +02:00
2011-06-06 03:33:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-15 10:57:26 +02:00
2011-07-08 01:05:28 +02:00
2011-07-06 01:34:08 +02:00
2011-07-16 19:43:35 +02:00
2011-07-09 02:06:40 +02:00
2011-07-16 19:43:35 +02:00
2011-07-08 01:05:28 +02:00
2011-07-05 02:26:17 +02:00
2011-07-05 02:26:17 +02:00
2011-06-21 04:45:29 +02:00
2011-07-10 04:28:50 +02:00
2011-07-14 20:44:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-09 02:06:40 +02:00
2011-06-05 03:00:31 +02:00
2011-07-16 19:43:35 +02:00
2011-06-15 01:16:58 +02:00
2011-06-08 05:25:28 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-11 04:23:25 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-06-05 03:00:31 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 02:24:10 +02:00
2011-07-12 01:42:32 +02:00
2011-06-21 03:07:11 +02:00
2011-06-01 00:09:05 +02:00
2011-06-02 05:12:10 +02:00
2011-06-05 03:00:31 +02:00
2011-06-14 04:56:26 +02:00
2011-06-13 11:33:44 +01:00
2011-07-16 19:43:35 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-06-03 05:19:30 +02:00
2011-07-12 01:42:32 +02:00
2011-07-16 18:56:47 +02:00
2011-07-12 01:42:32 +02:00
2011-07-14 20:44:58 +02:00
2011-07-15 17:51:09 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 12:54:26 +02:00
2011-07-11 05:46:51 +02:00
2011-07-04 00:45:21 +02:00
2011-07-15 17:51:09 +02:00
2011-07-01 05:35:26 +02:00
2011-06-03 05:19:30 +02:00
2011-06-30 04:32:24 +02:00
2011-06-30 04:32:24 +02:00
2011-07-12 01:42:32 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-06-24 03:07:04 +02:00
2011-07-15 17:51:09 +02:00
2011-06-08 16:38:37 +02:00
2011-07-12 01:42:32 +02:00
2011-07-06 10:05:08 +02:00
2011-07-06 10:05:08 +02:00
2011-06-21 03:38:25 +02:00
2011-07-15 17:51:09 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-07-17 14:20:52 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-03 03:14:10 +02:00
2011-06-07 03:37:57 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-07-17 20:12:02 +02:00
2011-06-20 04:07:34 +02:00
2011-06-20 04:07:34 +02:00
2011-07-12 01:42:32 +02:00
2011-07-16 19:43:35 +02:00
2011-06-02 20:06:00 +01:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-07-03 03:14:10 +02:00
2011-06-28 18:48:35 +02:00
2011-06-04 06:35:17 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-03 05:19:30 +02:00
2011-06-03 05:19:30 +02:00
2011-07-15 17:51:09 +02:00
2011-06-24 03:07:04 +02:00
2011-07-12 01:42:32 +02:00
2011-06-08 05:25:28 +02:00
2011-07-15 17:51:09 +02:00
2011-07-12 01:42:32 +02:00
2011-07-16 19:43:35 +02:00
2011-07-12 01:42:32 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-03 03:14:10 +02:00
2011-07-16 19:43:35 +02:00
2011-07-17 20:12:02 +02:00
2011-07-12 01:42:32 +02:00
2011-07-12 01:42:32 +02:00
2011-06-24 03:07:04 +02:00
2011-07-14 20:44:58 +02:00
2011-06-21 03:38:25 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-05 02:26:17 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-06-19 03:54:15 +02:00
2011-06-21 13:17:10 +02:00
2011-06-04 06:35:17 +02:00
2011-07-03 03:14:10 +02:00
2011-07-12 01:42:32 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-07-15 17:51:09 +02:00
2011-06-02 20:06:00 +01:00
78accb876c