• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 620c6292
    Michael Niedermayer authored
    * qatar/master:
      build: Fix Ogg demuxer dependencies
      build: Fix FLAC demuxer dependencies
      flac: Move flac functions shared between libraries to flac common code
      build: Fix CAF demuxer dependencies
      build: Fix MP2 muxer dependencies
      build: Add missing build rules for the ISMV muxer
      configure: Drop redundant mxf_d10 test dependency declaration
      Support AAC encoding via the external library fdk-aac
      libavcodec: Add more AAC profiles
      dct/fft-test: use a replacement getopt() if the system has none present.
    
    Conflicts:
    	Changelog
    	libavcodec/Makefile
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    620c6292
getopt.c 2.41 KB