• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7c29313b
    Michael Niedermayer authored
    * qatar/master:
      APIchanges: fill in revision for AVFrame.age deprecation
      avcodec: deprecate AVFrame.age
      4xm: remove unneeded check for remaining unused data.
      lavf: force threads to 1 in avformat_find_stream_info()
      swscale: fix overflows in vertical scaling at top/bottom edges.
      lavf: add OpenMG audio muxer.
      omadec: split data that will be used in the muxer to a separate file.
      lavf: rename oma.c -> omadec.c
      tmv decoder: set correct pix_fmt
    
    Conflicts:
    	Changelog
    	doc/APIchanges
    	libavcodec/mpegvideo.c
    	libavcodec/version.h
    	libavformat/oma.c
    	libavformat/version.h
    	libswscale/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7c29313b
tmv.c 3.19 KB