virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavf/vobsub: free index pseudo-packet.

Browse Source
This commit is contained in:
Nicolas George
2013-03-20 11:12:59 +01:00
parent 6a90f6d789
commit cdd78a65f4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mpeg.c
View File

@@ -805,6 +805,8 @@ end:
return ret; return ret;
} }
#define FAIL(r) do { ret = r; goto fail; } while (0)
static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt) static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MpegDemuxContext *vobsub = s->priv_data; MpegDemuxContext *vobsub = s->priv_data;
@@ -838,7 +840,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = mpegps_read_pes_header(vobsub->sub_ctx, NULL, &startcode, &pts, &dts); ret = mpegps_read_pes_header(vobsub->sub_ctx, NULL, &startcode, &pts, &dts);
if (ret < 0) if (ret < 0)
return ret; FAIL(ret);
to_read = ret & 0xffff; to_read = ret & 0xffff;
/* this prevents reads above the current packet */ /* this prevents reads above the current packet */
@@ -855,7 +857,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = av_grow_packet(pkt, to_read); ret = av_grow_packet(pkt, to_read);
if (ret < 0) if (ret < 0)
return ret; FAIL(ret);
n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read); n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read);
if (n < to_read) if (n < to_read)
@@ -870,7 +872,12 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pos = idx_pkt.pos; pkt->pos = idx_pkt.pos;
pkt->stream_index = idx_pkt.stream_index; pkt->stream_index = idx_pkt.stream_index;
av_free_packet(&idx_pkt);
return 0; return 0;
fail:
av_free_packet(&idx_pkt);
return ret;
} }
static int vobsub_read_seek(AVFormatContext *s, int stream_index, static int vobsub_read_seek(AVFormatContext *s, int stream_index,