1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 674216991d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: Fix APE tag dependencies
  MS Expression Encoder Screen decoder
  libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-13 22:22:24 +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