projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
496dcbb
)
If we get an error from ff_aac_parse_header() we should not trust the header info...
author
Alex Converse
<alex.converse@gmail.com>
Fri, 6 Mar 2009 22:36:24 +0000
(22:36 +0000)
committer
Alex Converse
<alex.converse@gmail.com>
Fri, 6 Mar 2009 22:36:24 +0000
(22:36 +0000)
Originally committed as revision 17860 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/aac.c
patch
|
blob
|
history
diff --git
a/libavcodec/aac.c
b/libavcodec/aac.c
index
694f406
..
e10905e
100644
(file)
--- a/
libavcodec/aac.c
+++ b/
libavcodec/aac.c
@@
-1598,7
+1598,6
@@
static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) {
ac->m4ac.sample_rate = hdr_info.sample_rate;
ac->m4ac.sampling_index = hdr_info.sampling_index;
ac->m4ac.object_type = hdr_info.object_type;
- }
if (hdr_info.num_aac_frames == 1) {
if (!hdr_info.crc_absent)
skip_bits(gb, 16);
@@
-1606,6
+1605,7
@@
static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) {
ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);
return -1;
}
+ }
return size;
}