• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5dc6bd86
    Michael Niedermayer authored
    * qatar/master:
      APIchanges: fill in missing hashes and dates.
      Add an APIChanges entry and bump minor versions for recent changes.
      ffmpeg: print the low bitrate warning after the codec is openend.
      doxygen: Move function documentation into the macro generating the function.
      doxygen: Make sure parameter names match between .c and .h files.
      h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
      H.264: Add more x86 assembly for 10-bit H.264 predict functions
      lavf: fix invalid reads in avformat_find_stream_info()
      cmdutils: replace opt_default with opt_default2() and remove set_context_opts
      ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
      ffplay: use new avcodec_open2 and avformat_find_stream_info API.
      cmdutils: store all codec options in one dict instead of video/audio/sub
      ffmpeg: check experimental flag after codec is opened.
      ffmpeg: do not set GLOBAL_HEADER flag in the options context
    
    Conflicts:
    	cmdutils.c
    	doc/APIchanges
    	ffmpeg.c
    	ffplay.c
    	libavcodec/version.h
    	libavformat/version.h
    	libswscale/swscale_unscaled.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5dc6bd86
swscale.h 12.4 KB