diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:50:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 11:51:13 +0100 |
| commit | 405ceb181236b0c7b4558dbefac8869c93df5965 (patch) | |
| tree | b68e99e62e1f4541969706b56e281aa94f15e1b4 /libavcodec/aacsbr.c | |
| parent | ab71be091206a2264f3a8862215fc284bb8e6274 (diff) | |
| parent | 454959a5aa73b585e2937b948178310c74bfc297 (diff) | |
| download | ffmpeg-405ceb181236b0c7b4558dbefac8869c93df5965.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Set the profile during decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbr.c')
| -rw-r--r-- | libavcodec/aacsbr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 0b6779c293..4caabb5087 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -932,6 +932,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, } else { #if 1 *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left); + ac->avctx->profile = FF_PROFILE_AAC_HE_V2; #else avpriv_report_missing_feature(ac->avctx, "Parametric Stereo"); skip_bits_long(gb, *num_bits_left); // bs_fill_bits |