• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2905e3ff
    Michael Niedermayer authored
    * qatar/master:
      lavc: add opt_find to AVCodecContext class.
      h264: Complexify frame num gap shortening code
      intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
      Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
      Add minor bumps and APIChanges entries for lavf private options.
      ffmpeg: deprecate -vc and -tvstd
      ffmpeg: use new avformat_open_* API.
      ffserver: use new avformat_open_* API.
      ffprobe: use new avformat_open_* API.
      ffplay: use new avformat_open_* API.
      cmdutils: add opt_default2().
      dict: add AV_DICT_APPEND flag.
      lavf: add avformat_write_header() as a replacement for av_write_header().
      Deprecate av_open_input_* and remove their uses.
      lavf: add avformat_open_input() as a replacement for av_open_input_*
      AVOptions: add av_opt_find() as a replacement for av_find_opt.
      AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
      ffmpeg: don't abuse a global for passing frame size from input to output
      ffmpeg: don't abuse a global for passing pixel format from input to output
      ffmpeg: initialise encoders earlier.
    
    Conflicts:
    	cmdutils.c
    	doc/APIchanges
    	ffmpeg.c
    	ffplay.c
    	ffprobe.c
    	libavcodec/h264.c
    	libavformat/avformat.h
    	libavformat/utils.c
    	libavformat/version.h
    	libavutil/avutil.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2905e3ff
ffmpeg.c 167 KB