generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,523 Commits 24 Branches 241 Tags 173 MiB
a8f6df8a4f
Commit Graph

7 Commits

Author SHA1 Message Date
Paul B Mahol
a8f6df8a4f libfdk-aacenc: remove redundant log message if ff_alloc_packet2 fails 
The whole point of ff_alloc_packet2 is to not bloat code with
duplicated error messages.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-15 02:19:48 +00:00
Michael Niedermayer
ab46300078 Merge remote-tracking branch 'dwbuiten/master' 
* dwbuiten/master:
  doc: Remove stray @item from git-howto
  libfdk-aac: Port to ff_alloc_packet2
  doxy: move av_guess_sample_aspect_ratio to correct place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-15 03:40:19 +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
Derek Buitenhuis
7ff318e2dd libfdk-aac: Port to ff_alloc_packet2 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-13 11:51:06 -04:00
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
Martin Storsjö
7548831c5e libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-12 23:37:29 +03:00
Martin Storsjö
37eeb5e273 Support AAC encoding via the external library fdk-aac 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-12 11:01:10 +03:00