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:
7ccc0ed
)
nutdec: more specific return codes for decode_syncpoint()
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 Mar 2013 15:51:21 +0000
(16:51 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 4 Mar 2013 15:51:21 +0000
(16:51 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/nutdec.c
patch
|
blob
|
history
diff --git
a/libavformat/nutdec.c
b/libavformat/nutdec.c
index
90afbdb
..
8896518
100644
(file)
--- a/
libavformat/nutdec.c
+++ b/
libavformat/nutdec.c
@@
-557,14
+557,14
@@
static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr)
tmp = ffio_read_varlen(bc);
*back_ptr = nut->last_syncpoint_pos - 16 * ffio_read_varlen(bc);
if (*back_ptr < 0)
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count],
tmp / nut->time_base_count);
if (skip_reserved(bc, end) || ffio_get_checksum(bc)) {
av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n");
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
}
*ts = tmp / nut->time_base_count *