repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
jacosubdec.c
diff --git
a/ffmpeg/libavformat/jacosubdec.c
b/ffmpeg/libavformat/jacosubdec.c
index 9a288701a6fd3f10bfc71edc8f154f6ee9af8ea9..1ca005587746cb3c63e864ab964deab96032d27d 100644
(file)
--- a/
ffmpeg/libavformat/jacosubdec.c
+++ b/
ffmpeg/libavformat/jacosubdec.c
@@
-232,7
+232,7
@@
static int jacosub_read_header(AVFormatContext *s)
/* general/essential directives in the extradata */
ret = avpriv_bprint_to_extradata(st->codec, &header);
if (ret < 0)
/* general/essential directives in the extradata */
ret = avpriv_bprint_to_extradata(st->codec, &header);
if (ret < 0)
-
return ret
;
+
goto fail
;
/* SHIFT and TIMERES affect the whole script so packet timing can only be
* done in a second pass */
/* SHIFT and TIMERES affect the whole script so packet timing can only be
* done in a second pass */
@@
-243,6
+243,9
@@
static int jacosub_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(&jacosub->q);
return 0;
ff_subtitles_queue_finalize(&jacosub->q);
return 0;
+fail:
+ jacosub_read_close(s);
+ return ret;
}
static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt)
}
static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt)