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