Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
4ba01419
Commit
4ba01419
authored
Dec 05, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/dvbsubdec: Pass context to av_log()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
b0ae362a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
dvbsubdec.c
libavcodec/dvbsubdec.c
+11
-9
No files found.
libavcodec/dvbsubdec.c
View file @
4ba01419
...
...
@@ -468,7 +468,8 @@ static av_cold int dvbsub_close_decoder(AVCodecContext *avctx)
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
,
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,
}
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
;
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
,
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,
}
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
;
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
,
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,
}
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
;
}
...
...
@@ -933,7 +935,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
else
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
,
non_mod
,
map_table
,
x_pos
);
break
;
...
...
@@ -948,7 +950,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
else
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
,
non_mod
,
map_table
,
x_pos
);
break
;
...
...
@@ -958,7 +960,7 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
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
,
non_mod
,
NULL
,
x_pos
);
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment