ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-04 12:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,228 Commits 37 Branches 400 Tags 496 MiB
59e4e40673
Commit Graph

2 Commits

Author SHA1 Message Date
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
Kostya Shishkov
5b7e3a195d MS Expression Encoder Screen decoder 2012-07-13 06:59:48 +02:00