diff options
| author | Christoph Willing <chris.willing@linux.com> | 2018-12-10 08:02:44 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-12-10 13:31:01 +0700 |
| commit | 1f24102ef7b6e71f28cc0a2e9cc7663775f5390d (patch) | |
| tree | 8bafef259f33c343a627f85bd3f2196fc9e45e24 | |
| parent | cc37524e1d90dc999fbca85edd5c88f6e7c6b773 (diff) | |
| download | slackbuilds-1f24102ef7b6e71f28cc0a2e9cc7663775f5390d.tar.gz | |
multimedia/ffmpeg: Fix build with new libfdk-aac API.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch | 11 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch b/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch new file mode 100644 index 0000000000..03d831d72d --- /dev/null +++ b/multimedia/ffmpeg/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch @@ -0,0 +1,11 @@ +--- libavcodec/libfdk-aacenc.c.orig 2017-02-10 23:25:26.000000000 +1000 ++++ libavcodec/libfdk-aacenc.c 2018-12-10 07:59:22.515000000 +1000 +@@ -286,7 +286,7 @@ + } + + avctx->frame_size = info.frameLength; +- avctx->initial_padding = info.encoderDelay; ++ avctx->initial_padding = info.nDelay; + ff_af_queue_init(avctx, &s->afq); + + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index 6e740b34fe..bba18397a9 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -157,6 +157,9 @@ find -L . \ # Patch for openjpeg-2.3.0 patch -p1 < $CWD/ffmpeg-3.2.4-openjpeg2.3.patch +#patch for libfdk-aac 2.0.0 +patch -p0 < $CWD/ffmpeg-3.2.4-libfdk_aac-2.0.0.patch + # Fix linking with flite: sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \ ./configure |