Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
c75b8695
Commit
c75b8695
authored
9 years ago
by
Aman Gupta
Committed by
Clément Bœsch
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
lavc/ccaption_dec: rename screen_changed to buffer_changed
parent
8fd7f03c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/ccaption_dec.c
+5
-5
5 additions, 5 deletions
libavcodec/ccaption_dec.c
with
5 additions
and
5 deletions
libavcodec/ccaption_dec.c
+
5
−
5
View file @
c75b8695
...
...
@@ -123,7 +123,7 @@ typedef struct CCaptionSubContext {
uint8_t
cursor_color
;
uint8_t
cursor_font
;
AVBPrint
buffer
;
int
screen
_changed
;
int
buffer
_changed
;
int
rollup
;
enum
cc_mode
mode
;
int64_t
start_time
;
...
...
@@ -365,7 +365,7 @@ static void handle_edm(CCaptionSubContext *ctx, int64_t pts)
reap_screen
(
ctx
,
pts
);
screen
->
row_used
=
0
;
ctx
->
screen
_changed
=
1
;
ctx
->
buffer
_changed
=
1
;
}
static
void
handle_eoc
(
CCaptionSubContext
*
ctx
,
int64_t
pts
)
...
...
@@ -458,7 +458,7 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint
ff_dlog
(
ctx
,
"carriage return
\n
"
);
reap_screen
(
ctx
,
pts
);
roll_up
(
ctx
);
ctx
->
screen
_changed
=
1
;
ctx
->
buffer
_changed
=
1
;
ctx
->
cursor_column
=
0
;
break
;
case
0x2f
:
...
...
@@ -512,7 +512,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
continue
;
else
process_cc608
(
ctx
,
avpkt
->
pts
,
*
(
bptr
+
i
+
1
)
&
0x7f
,
*
(
bptr
+
i
+
2
)
&
0x7f
);
if
(
ctx
->
screen
_changed
&&
*
ctx
->
buffer
.
str
)
if
(
ctx
->
buffer
_changed
&&
*
ctx
->
buffer
.
str
)
{
int
start_time
=
av_rescale_q
(
ctx
->
start_time
,
avctx
->
time_base
,
ass_tb
);
int
end_time
=
av_rescale_q
(
ctx
->
end_time
,
avctx
->
time_base
,
ass_tb
);
...
...
@@ -521,7 +521,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
if
(
ret
<
0
)
return
ret
;
sub
->
pts
=
av_rescale_q
(
ctx
->
start_time
,
avctx
->
time_base
,
AV_TIME_BASE_Q
);
ctx
->
screen
_changed
=
0
;
ctx
->
buffer
_changed
=
0
;
av_bprint_clear
(
&
ctx
->
buffer
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment