• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d0492578
    Michael Niedermayer authored
    * qatar/master:
      presets: rename presets directory
      lavc: make avcodec_get_context_defaults3 "officially" public
      lavf: replace av_new_stream->avformat_new_stream part II.
      lavf,lavd: replace av_new_stream->avformat_new_stream part I.
      lavf: add avformat_new_stream as a replacement for av_new_stream.
      Use correct scaling table for bwd-pred MVs in second B-field
      Ut Video decoder
      Makefile: change presets extension to .avpreset
      lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
      lavfi: add testsrc source
      AVOptions: add documentation.
      presets: update libx264 ffpresets
    
    Conflicts:
    	Changelog
    	doc/APIchanges
    	doc/ffmpeg.texi
    	ffpresets/libx264-ipod320.ffpreset
    	ffpresets/libx264-ipod640.ffpreset
    	ffserver.c
    	libavcodec/avcodec.h
    	libavcodec/options.c
    	libavcodec/version.h
    	libavdevice/libdc1394.c
    	libavfilter/avfilter.h
    	libavfilter/vsrc_testsrc.c
    	libavformat/flvdec.c
    	libavformat/riff.c
    	libavformat/version.h
    	libavformat/wtv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d0492578
alsa-audio-dec.c 4.87 KB