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:
273fca9
)
mp3dec: propagate error code correctly.
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 20 Oct 2012 23:31:53 +0000
(
01:31
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 21 Oct 2012 00:52:10 +0000
(
02:52
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegaudiodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegaudiodec.c
b/libavcodec/mpegaudiodec.c
index
6ef1f6b
..
77f86c5
100644
(file)
--- a/
libavcodec/mpegaudiodec.c
+++ b/
libavcodec/mpegaudiodec.c
@@
-1616,6
+1616,9
@@
static int mp_decode_frame(MPADecodeContext *s, OUT_INT *samples,
s->last_buf_size += i;
}
+ if(nb_frames < 0)
+ return nb_frames;
+
/* get output buffer */
if (!samples) {
s->frame.nb_samples = s->avctx->frame_size;