Skip to content

F
ffmpeg
Commit 4ba01419 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/dvbsubdec: Pass context to av_log() 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b0ae362a
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
libavcodec/dvbsubdec.c
View file @ 4ba01419
...@@ -468,7 +468,8 @@ static av_cold int dvbsub_close_decoder(AVCodecContext *avctx) ...@@ -468,7 +468,8 @@ static av_cold int dvbsub_close_decoder(AVCodecContext *avctx)
return 0; return 0;
} }
static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_2bit_string(AVCodecContext *avctx,
uint8_t *destbuf, int dbuf_len,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table, int x_pos) int non_mod, uint8_t *map_table, int x_pos)
{ {
...@@ -568,14 +569,14 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, ...@@ -568,14 +569,14 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
} }
if (get_bits(&gb, 6)) if (get_bits(&gb, 6))
av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n"); av_log(avctx, AV_LOG_ERROR, "DVBSub error: line overflow\n");
(*srcbuf) += (get_bits_count(&gb) + 7) >> 3; (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
return pixels_read; return pixels_read;
} }
static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_4bit_string(AVCodecContext *avctx, uint8_t *destbuf, int dbuf_len,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table, int x_pos) int non_mod, uint8_t *map_table, int x_pos)
{ {
...@@ -691,14 +692,15 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, ...@@ -691,14 +692,15 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
} }
if (get_bits(&gb, 8)) if (get_bits(&gb, 8))
av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n"); av_log(avctx, AV_LOG_ERROR, "DVBSub error: line overflow\n");
(*srcbuf) += (get_bits_count(&gb) + 7) >> 3; (*srcbuf) += (get_bits_count(&gb) + 7) >> 3;
return pixels_read; return pixels_read;
} }
static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_8bit_string(AVCodecContext *avctx,
uint8_t *destbuf, int dbuf_len,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table, int x_pos) int non_mod, uint8_t *map_table, int x_pos)
{ {
...@@ -746,7 +748,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, ...@@ -746,7 +748,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
} }
if (*(*srcbuf)++) if (*(*srcbuf)++)
av_log(0, AV_LOG_ERROR, "DVBSub error: line overflow\n"); av_log(avctx, AV_LOG_ERROR, "DVBSub error: line overflow\n");
return pixels_read; return pixels_read;
} }
...@@ -933,7 +935,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis ...@@ -933,7 +935,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
else else
map_table = NULL; map_table = NULL;
x_pos = dvbsub_read_2bit_string(pbuf + (y_pos * region->width), x_pos = dvbsub_read_2bit_string(avctx, pbuf + (y_pos * region->width),
region->width, &buf, buf_end - buf, region->width, &buf, buf_end - buf,
non_mod, map_table, x_pos); non_mod, map_table, x_pos);
break; break;
...@@ -948,7 +950,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis ...@@ -948,7 +950,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
else else
map_table = NULL; map_table = NULL;
x_pos = dvbsub_read_4bit_string(pbuf + (y_pos * region->width), x_pos = dvbsub_read_4bit_string(avctx, pbuf + (y_pos * region->width),
region->width, &buf, buf_end - buf, region->width, &buf, buf_end - buf,
non_mod, map_table, x_pos); non_mod, map_table, x_pos);
break; break;
...@@ -958,7 +960,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis ...@@ -958,7 +960,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
return; return;
} }
x_pos = dvbsub_read_8bit_string(pbuf + (y_pos * region->width), x_pos = dvbsub_read_8bit_string(avctx, pbuf + (y_pos * region->width),
region->width, &buf, buf_end - buf, region->width, &buf, buf_end - buf,
non_mod, NULL, x_pos); non_mod, NULL, x_pos);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment