• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b18e17ea
    Michael Niedermayer authored
    * qatar/master: (21 commits)
      utils: Check for extradata size overflows.
      ARM: rv34: fix asm syntax in dc transform functions
      avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
      rv34: fix and optimise frame dependency checking
      rv34: NEON optimised dc only inverse transform
      avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
      ffmenc: remove references to deprecated AVFormatContext.timestamp.
      lavf: undeprecate read_seek().
      avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
      lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
      lavc: ifdef out parse_only AVOption
      nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
      mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
      riff: remove references to sonic codec ids
      indeo4: add some missing static and const qualifiers
      rv34: DC-only inverse transform
      avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
      lavfi: move version macros to a new installed header version.h
      vsrc_buffer: release the buffer on uninit.
      rgb2rgb: rgb12tobgr12()
      ...
    
    Conflicts:
    	avconv.c
    	doc/APIchanges
    	ffprobe.c
    	libavfilter/Makefile
    	libavfilter/avfilter.h
    	libswscale/rgb2rgb.c
    	libswscale/rgb2rgb.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b18e17ea
Makefile 4.4 KB