• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 39e4206d
    Michael Niedermayer authored
    * 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 (30315a8d)
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    39e4206d
sndio_dec.c 3.42 KB