• Michael Niedermayer's avatar
    Merge commit 'bfe5454c' · 076300bf
    Michael Niedermayer authored
    * commit 'bfe5454c':
      lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
      lavf: move "MP3 " fourcc from riff to nut
      fate: vpx: Add dependencies
      fate: Fix wavpack-matroskamode test dependencies
      x86: dsputilenc: port to cpuflags
    
    Conflicts:
    	libavformat/internal.h
    	libavformat/nut.c
    	tests/fate/vpx.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    076300bf
smjpegenc.c 4.53 KB