Michael Niedermayer
39e4206dc6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (32 commits)
doc: create separate section for audio encoders
swscale: Remove orphaned, commented-out function declaration.
swscale: Eliminate rgb24toyv12_c() duplication.
Remove h263_msmpeg4 from MpegEncContext.
APIchanges: Fill in git hash for fps_probe_size (30315a8)
avformat: Add fpsprobesize as an AVOption.
avoptions: Return explicitly NAN or {0,0} if the option isn't found
rtmp: Reindent
rtmp: Don't try to do av_malloc(0)
tty: replace AVFormatParameters.sample_rate abuse with a private option.
Fix end time of last chapter in compute_chapters_end
ffmpeg: get rid of useless AVInputStream.nb_streams.
ffmpeg: simplify managing input files and streams
ffmpeg: purge redundant AVInputStream.index.
lavf: deprecate AVFormatParameters.channel.
libdc1394: add a private option for channel.
dv1394: add a private option for channel.
v4l2: reindent.
v4l2: add a private option for channel.
lavf: deprecate AVFormatParameters.standard.
...
Conflicts:
doc/APIchanges
doc/encoders.texi
ffmpeg.c
libavdevice/alsa-audio.h
libavformat/version.h
libavutil/opt.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-26 03:28:22 +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-03-19 13:33:20 +00: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-03-19 13:33:20 +00:00
2011-05-06 17:39:31 +02:00
2011-05-17 01:56:01 +02:00
2011-05-15 03:25:57 +02:00
2011-03-23 02:42:56 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-25 06:32:45 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +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-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-20 05:48:22 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +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-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +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-03-19 13:33:20 +00:00
2011-05-07 20:14:47 +02:00
2011-05-09 17:49:25 +02:00
2011-05-22 04:53:19 +02:00
2011-05-17 23:01:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +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-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-05-15 03:25:57 +02:00
2011-04-28 10:45:32 +02:00
2011-04-28 10:45:32 +02:00
2011-05-17 01:47:12 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-05-17 23:01:42 +02:00
2011-05-01 00:26:05 +02:00
2011-04-10 03:32:29 +02:00
2011-03-29 02:46:11 +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-03-19 13:33:20 +00:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2011-03-19 13:33:20 +00:00
2011-04-15 04:50:06 +02:00
2011-04-25 12:13:51 +10:00
2011-04-16 17:51:00 +02:00
2011-04-09 03:17:07 +02:00
2011-04-30 01:58:26 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-03-25 02:57:41 +01:00
2011-03-19 13:33:20 +00:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +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-04-18 18:23:16 +02:00
2011-04-01 17:38:29 +02:00
2011-05-18 05:42:42 +02:00
2011-04-18 14:30:14 -07:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-21 03:37:05 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-02 16:41:41 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-09 16:05:29 +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-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-05-18 10:35:52 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-17 00:58:33 +02:00
2011-05-24 01:31:53 +02:00
2011-03-19 13:33:20 +00:00
2011-05-20 01:44:10 +02:00
2011-04-17 23:43:54 +02:00
2011-05-17 01:47:12 +02:00
2011-05-17 01:47:12 +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-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-01-30 03:40:58 +01:00
2011-03-19 13:33:20 +00:00
2011-04-20 04:48:23 +02:00
2011-03-19 13:33:20 +00:00
2011-04-07 03:32:26 +02:00
2011-04-03 16:40:12 +02:00
2011-05-20 01:44:10 +02:00
2011-05-24 23:34:24 +02:00
2011-05-24 23:34:24 +02:00
2011-05-24 23:26:24 +02:00
2011-05-24 01:12:19 +02:00
2011-03-19 13:33:20 +00:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-04-20 04:48:23 +02:00
2011-05-17 03:05:36 +02:00
2011-05-25 11:15:56 +02:00
2011-05-20 01:44:10 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-23 02:42:56 +01:00
2011-05-21 05:32:03 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-04-29 17:27:01 +02:00
2011-03-19 13:33:20 +00:00
2011-04-29 17:27:01 +02:00
2011-05-26 03:28:22 +02:00
2011-03-19 13:33:20 +00:00
2011-05-21 05:32:03 +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-03-19 13:33:20 +00: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-03-19 13:33:20 +00:00
2011-04-17 23:59:00 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-29 04:29:21 +02:00
2011-05-12 14:37:50 +02:00
2011-03-19 13:33:20 +00:00
2011-04-28 07:25:28 +02:00
2011-03-19 13:33:20 +00:00
2011-04-20 04:48:23 +02:00
2011-05-07 09:47:35 +02:00
2011-03-19 13:33:20 +00:00
2011-05-24 00:43:00 +02:00
2011-04-19 15:49:32 +02:00
2011-05-10 19:30:56 +02:00
2011-04-19 23:36:29 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-02-06 16:08:59 -05: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-02-09 03:31:17 +01:00
2011-04-23 01:09:43 +02:00
2011-05-26 03:28:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-05-22 20:01:31 +02:00
2011-03-19 13:33:20 +00: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-03-19 13:33:20 +00: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-05-26 03:28:22 +02:00
2011-05-26 03:28:22 +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-24 03:41:22 +02:00
2011-03-19 13:33:20 +00:00
2011-05-24 01:31:53 +02:00
2011-04-15 04:50:06 +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-29 17:27:01 +02:00
2011-04-04 02:15:12 +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-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-05-26 03:28:22 +02:00
2011-04-09 03:17:07 +02:00
2011-05-26 03:28:22 +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-04-24 03:41:22 +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-04-24 03:41:22 +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-04-24 03:41:22 +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-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-20 01:44:10 +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-05-20 01:44:10 +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-05-20 01:44:10 +02:00
2011-05-20 01:44:10 +02:00
2011-05-10 04:03:17 +02:00
2011-05-24 19:11:28 +02:00
2011-05-12 04:51:24 +02:00
2011-03-19 13:33:20 +00:00
2011-05-12 04:51:24 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-20 01:44:10 +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-02 01:54:27 +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-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-05-22 04:53:19 +02:00
2011-03-19 13:33:20 +00:00
2011-05-17 23:01:42 +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-24 17:46:50 +02:00
2011-04-21 03:37:05 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-04-12 03:48:21 +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-05-26 03:28:22 +02:00
2011-03-19 13:33:20 +00:00
2011-05-18 17:17:56 +02:00
2011-05-22 04:53:19 +02:00
2011-05-26 03:28:22 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-05-26 03:28:22 +02: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-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-24 13:35:27 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-01 21:13:18 +02:00
2011-05-01 21:13:18 +02:00
2011-05-09 04:17:24 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-04-16 03:55:48 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00