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:
11752d1
)
aasc: return correct buffer size from aasc_decode_frame
author
Andreas Cadhalpun
<andreas.cadhalpun@googlemail.com>
Thu, 16 Apr 2015 17:12:02 +0000
(19:12 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 22 Apr 2015 10:27:24 +0000
(12:27 +0200)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
0be54ad280cf114c02306b7063147e8379f8ed1e
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aasc.c
patch
|
blob
|
history
diff --git
a/libavcodec/aasc.c
b/libavcodec/aasc.c
index
38658f8
..
a23f9b3
100644
(file)
--- a/
libavcodec/aasc.c
+++ b/
libavcodec/aasc.c
@@
-137,7
+137,7
@@
static int aasc_decode_frame(AVCodecContext *avctx,
return ret;
/* report that the buffer was completely consumed */
- return
buf_
size;
+ return
avpkt->
size;
}
static av_cold int aasc_decode_end(AVCodecContext *avctx)