• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f9ecb849
    Michael Niedermayer authored
    * qatar/master:
      crypto: Use av_freep instead of av_free
      lavf: don't try to free private options if priv_data is NULL.
      swscale: fix types of assembly arguments.
      swscale: move two macros that are only used once into caller.
      swscale: remove unused function.
      options: Add missing braces around struct initializer.
      mov: Remove leftover crufty debug statement with references to a local file.
      dvbsubdec: Fix compilation of debug code.
      Remove all uses of now deprecated metadata functions.
      Move metadata API from lavf to lavu.
    
    Conflicts:
    	doc/APIchanges
    	libavformat/aiffdec.c
    	libavformat/asfdec.c
    	libavformat/avformat.h
    	libavformat/avidec.c
    	libavformat/cafdec.c
    	libavformat/matroskaenc.c
    	libavformat/mov.c
    	libavformat/mp3enc.c
    	libavformat/wtv.c
    	libavutil/avutil.h
    	libavutil/internal.h
    	libswscale/swscale.c
    	libswscale/x86/swscale_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f9ecb849
soxenc.c 3.58 KB