generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dvdsubdec: factor out rectangles reset.

Browse Source
This commit is contained in:
Clément Bœsch 2013-09-29 22:10:35 +02:00
parent c7fe2a3733
commit 41fd6f0796
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/dvdsubdec.c
View File

@ -184,6 +184,21 @@ static void guess_palette(DVDSubContext* ctx,
} }
} }
static void reset_rects(AVSubtitle *sub_header)
{
int i;
if (sub_header->rects != NULL) {
for (i = 0; i < sub_header->num_rects; i++) {
av_freep(&sub_header->rects[i]->pict.data[0]);
av_freep(&sub_header->rects[i]->pict.data[1]);
av_freep(&sub_header->rects[i]);
}
av_freep(&sub_header->rects);
sub_header->num_rects = 0;
}
}
#define READ_OFFSET(a) (big_offsets ? AV_RB32(a) : AV_RB16(a)) #define READ_OFFSET(a) (big_offsets ? AV_RB32(a) : AV_RB16(a))
static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
@ -324,15 +339,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
if (h < 0) if (h < 0)
h = 0; h = 0;
if (w > 0 && h > 0) { if (w > 0 && h > 0) {
if (sub_header->rects != NULL) { reset_rects(sub_header);
for (i = 0; i < sub_header->num_rects; i++) {
av_freep(&sub_header->rects[i]->pict.data[0]);
av_freep(&sub_header->rects[i]->pict.data[1]);
av_freep(&sub_header->rects[i]);
}
av_freep(&sub_header->rects);
sub_header->num_rects = 0;
}
bitmap = av_malloc(w * h); bitmap = av_malloc(w * h);
sub_header->rects = av_mallocz(sizeof(*sub_header->rects)); sub_header->rects = av_mallocz(sizeof(*sub_header->rects));
@ -374,15 +381,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
if (sub_header->num_rects > 0) if (sub_header->num_rects > 0)
return is_menu; return is_menu;
fail: fail:
if (sub_header->rects != NULL) { reset_rects(sub_header);
for (i = 0; i < sub_header->num_rects; i++) {
av_freep(&sub_header->rects[i]->pict.data[0]);
av_freep(&sub_header->rects[i]->pict.data[1]);
av_freep(&sub_header->rects[i]);
}
av_freep(&sub_header->rects);
sub_header->num_rects = 0;
}
return -1; return -1;
} }