• Michael Niedermayer's avatar
    Merge commit 'e0f8be64' · f083b4c3
    Michael Niedermayer authored
    * commit 'e0f8be64':
      avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
    
    Conflicts:
    	libavformat/ac3dec.c
    	libavformat/avformat.h
    	libavformat/avs.c
    	libavformat/m4vdec.c
    	libavformat/mov.c
    	libavformat/mp3dec.c
    	libavformat/mpeg.c
    	libavformat/mpegvideodec.c
    	libavformat/psxstr.c
    	libavformat/pva.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f083b4c3
westwood_aud.c 6.09 KB