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:
ce8dc93
)
avformat/assenc: return correct error code
author
Clément Bœsch
<u@pkh.me>
Sat, 20 Sep 2014 19:39:57 +0000
(21:39 +0200)
committer
Clément Bœsch
<u@pkh.me>
Sun, 21 Sep 2014 16:50:16 +0000
(18:50 +0200)
libavformat/assenc.c
patch
|
blob
|
history
diff --git
a/libavformat/assenc.c
b/libavformat/assenc.c
index
2afeef7
..
24833d2
100644
(file)
--- a/
libavformat/assenc.c
+++ b/
libavformat/assenc.c
@@
-47,7
+47,7
@@
static int write_header(AVFormatContext *s)
if (s->nb_streams != 1 || (avctx->codec_id != AV_CODEC_ID_SSA &&
avctx->codec_id != AV_CODEC_ID_ASS)) {
av_log(s, AV_LOG_ERROR, "Exactly one ASS/SSA stream is needed.\n");
- return
-1
;
+ return
AVERROR(EINVAL)
;
}
ass->write_ts = avctx->codec_id == AV_CODEC_ID_ASS;
avpriv_set_pts_info(s->streams[0], 64, 1, 100);