github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-30 22:00:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6'

Browse Source 
* commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6':
  lavc: add profiles to AVCodecDescriptor

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2016-01-01 16:16:57 +01:00
parent 5f2d12b824 2c6811397b
commit 5e8b053452
19 changed files with 228 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacdec_fixed.c
View File

@@ -80,6 +80,7 @@
#include "aacsbr.h"
#include "mpeg4audio.h"
#include "aacadtsdec.h"
#include "profiles.h"
#include "libavutil/intfloat.h"
#include <math.h>
@@ -440,5 +441,6 @@ AVCodec ff_aac_fixed_decoder = {
.capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
.channel_layouts = aac_channel_layout,
.profiles = NULL_IF_CONFIG_SMALL(ff_aac_profiles),
.flush = flush,
};