• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · bb3ed3ba
    Michael Niedermayer authored
    * qatar/master:
      fate: Add FATE tests for the Ut Video encoder
      lavc: add Ut Video encoder
      mpegvideo_enc: remove stray duplicate line from 7f9aaa49
      swscale: x86: fix #endif comments in rgb2rgb template file
      avconv: mark more options as expert.
      avconv: split printing "main options" into global and per-file.
      avconv: refactor help printing.
    
    Conflicts:
    	Changelog
    	ffmpeg_opt.c
    	ffserver.c
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bb3ed3ba
version.h 3.25 KB