diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:54:44 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:54:44 +0100 |
| commit | 842e7853c73d09f8e262d379b5bc1479098655d8 (patch) | |
| tree | 9c3cf18ee7b0ff7e98806016cd5dfb543c568ad9 | |
| parent | 92cd2c04b1c255a40cfb27732aad4bc78211cd93 (diff) | |
| parent | 42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e (diff) | |
| download | ffmpeg-842e7853c73d09f8e262d379b5bc1479098655d8.tar.gz | |
Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'
* commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e':
aac: Drop broken cruft
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/aacsbr_template.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index f8aa4854df..cf8621eee0 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -941,14 +941,8 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, skip_bits_long(gb, *num_bits_left); // bs_fill_bits *num_bits_left = 0; } else { -#if 1 *num_bits_left -= AAC_RENAME(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 - *num_bits_left = 0; -#endif } break; default: |