Michael Niedermayer 620c6292b1 Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2012-07-12 23:57:00 +02:00
..
2012-07-10 21:42:23 +00:00
2011-12-15 18:38:06 +01:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-06-18 09:38:36 +02:00
2012-07-08 19:54:08 +02:00
2012-05-22 00:39:53 +02:00
2012-05-25 17:27:40 +02:00
2012-03-13 01:14:04 +01:00
2012-03-20 11:10:25 +00:00