Michael Niedermayer
edae3dbf1d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (23 commits)
h264: hide reference frame errors unless requested
swscale: split hScale() function pointer into h[cy]Scale().
Move clipd macros to x86util.asm.
avconv: reindent.
avconv: rescue poor abused start_time global.
avconv: rescue poor abused recording_time global.
avconv: merge two loops in output_packet().
avconv: fix broken indentation.
avconv: get rid of the arbitrary MAX_FILES limit.
avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia
avconv: add a wrapper for output AVFormatContexts and merge output_opts into it
avconv: make itsscale syntax consistent with other options.
avconv: factor out adding input streams.
avconv: Factorize combining auto vsync with format.
avconv: Factorize video resampling.
avconv: Don't unnecessarily convert ipts to a double.
ffmpeg: remove unsed variable nopts
RV3/4 parser: remove unused variable 'off'
add XMV demuxer
rmdec: parse FPS in RealMedia properly
...
Conflicts:
avconv.c
libavformat/version.h
libswscale/swscale.c
tests/ref/fate/lmlm4-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-18 10:56:08 +02:00
..
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-31 19:40:08 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-18 10:56:08 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-26 15:37:22 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-08-04 20:59:36 +02:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-08-14 00:05:36 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-08-17 14:23:20 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-08-13 02:56:08 +02:00
2011-07-17 20:12:02 +02:00
2011-05-22 04:53:19 +02:00
2011-06-01 20:29:27 +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-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-07-24 23:52:42 +02:00
2011-08-01 00:58:49 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 02:43:55 +02:00
2011-05-01 00:26:05 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-02 18:38:01 +02:00
2011-08-14 01:56:28 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02:00
2011-05-05 03:30:24 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-07-17 20:12:02 +02:00
2011-08-17 14:23:20 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-21 03:37:05 +02:00
2011-08-03 20:06:38 +02:00
2011-03-19 13:33:20 +00:00
2011-07-18 16:43:46 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-17 23:01:42 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-08-15 23:35:53 +02:00
2011-07-17 20:12:02 +02:00
2011-07-14 02:24:10 +02:00
2011-07-17 20:12:02 +02:00
2011-06-22 05:16:40 +02:00
2011-05-17 01:47:12 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-01-30 03:40:58 +01:00
2011-07-17 20:12:02 +02:00
2011-07-06 01:34:08 +02:00
2011-07-17 20:12:02 +02:00
2011-04-07 03:32:26 +02:00
2011-05-27 23:48:22 +02:00
2011-08-18 10:56:08 +02:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-08-18 00:21:21 +02:00
2011-08-17 14:23:20 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-17 03:05:36 +02:00
2011-08-13 03:39:58 +02:00
2011-08-16 23:47:35 +02:00
2011-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-07-17 20:12:02 +02:00
2011-08-17 14:23:20 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-08-16 11:09:39 -07:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-05-27 23:48:22 +02:00
2011-08-09 19:56:25 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-15 00:40:54 +02:00
2011-03-19 13:33:20 +00:00
2011-07-30 06:46:08 +02:00
2011-08-13 19:13:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-05 03:00:31 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-13 00:42:11 +02:00
2011-06-09 04:47:19 +02:00
2011-08-10 21:03:39 +02:00
2011-05-30 00:24:01 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:59:00 +02:00
2011-02-06 16:08:59 -05:00
2011-06-08 07:43:45 +02:00
2011-07-17 20:12:02 +02:00
2011-08-13 02:56:08 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-05-26 03:28:22 +02:00
2011-03-19 13:33:20 +00:00
2011-04-06 19:30:42 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-15 17:51:09 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-08-15 23:35:53 +02:00
2011-06-05 03:00:31 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-18 05:10:38 +02:00
2011-07-14 20:44:58 +02:00
2011-08-09 21:53:48 +02:00
2011-04-15 04:50:06 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-08-18 10:56:08 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-18 05:10:38 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-06-03 05:19:30 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-07-22 12:08:52 +02:00
2011-04-24 03:41:22 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-18 05:10:38 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-06-11 03:51:36 +02:00
2011-07-25 16:37:12 +02:00
2011-07-19 18:46:04 +02:00
2011-07-19 18:46:04 +02:00
2011-03-19 13:33:20 +00:00
2011-08-15 23:35:53 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-11 03:51:36 +02:00
2011-07-14 17:55:15 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-07-17 20:12:02 +02:00
2011-08-01 00:58:49 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-30 02:39:26 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-04-12 03:48:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-15 23:35:53 +02:00
2011-03-19 13:33:20 +00:00
2011-07-25 16:37:12 +02:00
2011-07-14 20:44:58 +02:00
2011-08-17 14:23:20 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-18 10:56:08 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-03 18:30:02 +02:00
2011-05-01 21:13:18 +02:00
2011-07-15 16:57:35 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-08-17 15:04:37 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00