• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b286383b
    Michael Niedermayer authored
    * qatar/master:
      asfdec: read attached pictures.
      apetag: reindent
      apetag: export attached covers as video streams.
      apetag: fix the amount of data read from binary tags.
      apetag: make sure avio_get_str() doesn't read more than it should.
      mov: read itunes cover art.
      snow: remove VLA in mc_block()
      intfloat: Don't use designated initializers in the public headers
      snow: remove a VLA.
      doc: Remind devs to check return values, especially for malloc() et al
      MS ATC Screen (aka MSS3) decoder
      vf_yadif: move x86 init code to x86/yadif.c
      vf_gradfun: move x86 init code to x86/gradfun.c
      roqvideo: Remove a totally unused dspcontext
      smacker: remove some unused code
      dsicin: remove dead assignment
      aacdec: remove dead assignment
      rl2: remove dead assignment
      proresenc: make a variable local to the loop where it is used
      alsdec: remove dead assignments
    
    Conflicts:
    	Changelog
    	doc/developer.texi
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavfilter/gradfun.h
    	libavfilter/x86/gradfun.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b286383b
roqvideo.h 2.39 KB