OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f3be1c
)
aacenc_pred: only print predictor information if profile is aac_main
author
Rostislav Pehlivanov
<atomnuker@gmail.com>
Sat, 17 Oct 2015 01:15:44 +0000
(
02:15
+0100)
committer
Rostislav Pehlivanov
<atomnuker@gmail.com>
Sat, 17 Oct 2015 01:31:20 +0000
(
02:31
+0100)
Needed because LTP uses predictor_present as well.
libavcodec/aacenc_pred.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacenc_pred.c
b/libavcodec/aacenc_pred.c
index
293f9d8
..
d76a575
100644
(file)
--- a/
libavcodec/aacenc_pred.c
+++ b/
libavcodec/aacenc_pred.c
@@
-333,7
+333,8
@@
void ff_aac_encode_main_pred(AACEncContext *s, SingleChannelElement *sce)
IndividualChannelStream *ics = &sce->ics;
const int pmax = FFMIN(ics->max_sfb, ff_aac_pred_sfb_max[s->samplerate_index]);
- if (!ics->predictor_present)
+ if (s->profile != FF_PROFILE_AAC_MAIN ||
+ !ics->predictor_present)
return;
put_bits(&s->pb, 1, !!ics->predictor_reset_group);