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:
e2e6c87
)
mp3adu: return error instead of just consuming bad packets
author
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 25 Oct 2011 16:45:39 +0000
(12:45 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 28 Oct 2011 02:06:32 +0000
(22:06 -0400)
libavcodec/mpegaudiodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegaudiodec.c
b/libavcodec/mpegaudiodec.c
index
58e2bf7
..
2751df6
100644
(file)
--- a/
libavcodec/mpegaudiodec.c
+++ b/
libavcodec/mpegaudiodec.c
@@
-1847,8
+1847,8
@@
static int decode_frame_adu(AVCodecContext *avctx, void *data, int *data_size,
// Discard too short frames
if (buf_size < HEADER_SIZE) {
-
*data_size = 0
;
- return
buf_size
;
+
av_log(avctx, AV_LOG_ERROR, "Packet is too small\n")
;
+ return
AVERROR_INVALIDDATA
;
}
@@
-1859,8
+1859,8
@@
static int decode_frame_adu(AVCodecContext *avctx, void *data, int *data_size,
header = AV_RB32(buf) | 0xffe00000;
if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame
-
*data_size = 0
;
- return
buf_size
;
+
av_log(avctx, AV_LOG_ERROR, "Invalid frame header\n")
;
+ return
AVERROR_INVALIDDATA
;
}
avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header);