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
56bc0a67
Commit
56bc0a67
authored
Feb 08, 2015
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ass: make default playback resolution available to decoders
parent
a2cd07d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
ass.c
libavcodec/ass.c
+3
-2
ass.h
libavcodec/ass.h
+3
-0
No files found.
libavcodec/ass.c
View file @
56bc0a67
...
...
@@ -36,8 +36,8 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
"[Script Info]
\r\n
"
"; Script generated by FFmpeg/Lavc%s
\r\n
"
"ScriptType: v4.00+
\r\n
"
"PlayResX:
384
\r\n
"
"PlayResY:
288
\r\n
"
"PlayResX:
%d
\r\n
"
"PlayResY:
%d
\r\n
"
"
\r\n
"
"[V4+ Styles]
\r\n
"
...
...
@@ -67,6 +67,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
"[Events]
\r\n
"
"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
\r\n
"
,
!
(
avctx
->
flags
&
CODEC_FLAG_BITEXACT
)
?
AV_STRINGIFY
(
LIBAVCODEC_VERSION
)
:
""
,
ASS_DEFAULT_PLAYRESX
,
ASS_DEFAULT_PLAYRESY
,
font
,
font_size
,
color
,
color
,
back_color
,
back_color
,
-
bold
,
-
italic
,
-
underline
,
alignment
);
...
...
libavcodec/ass.h
View file @
56bc0a67
...
...
@@ -25,6 +25,9 @@
#include "avcodec.h"
#include "libavutil/bprint.h"
#define ASS_DEFAULT_PLAYRESX 384
#define ASS_DEFAULT_PLAYRESY 288
/**
* @name Default values for ASS style
* @{
...
...
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