Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 May 2011 01:00:37 +0000 (03:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 May 2011 01:28:22 +0000 (03:28 +0200)
commit39e4206dc672a596c742809c1466f8643a787208
tree36b642fc5221090e5bd8d7bc1968a966a5c6c104
parent189db9c9829b970b3e28006c9f00d6960f71cff1
parenta2ee2843c09a6116b090020eff8213b86ea98bdb
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>
31 files changed:
doc/APIchanges
doc/encoders.texi
ffmpeg.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio.h
libavdevice/bktr.c
libavdevice/dv1394.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/sndio_common.h
libavdevice/sndio_dec.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/mpegts.c
libavformat/options.c
libavformat/pcmdec.c
libavformat/rawdec.c
libavformat/rawdec.h
libavformat/rtmppkt.c
libavformat/rtmpproto.c
libavformat/tty.c
libavformat/utils.c
libavformat/version.h
libavutil/opt.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c