Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
88514378
Commit
88514378
authored
Jun 18, 2014
by
Clément Bœsch
Committed by
Clément Bœsch
Jun 18, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ass: move playres parameters below scripttype
Suggested-by: wm4
parent
5039aadf
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
17 additions
and
17 deletions
+17
-17
ass.c
libavcodec/ass.c
+1
-1
sub-aqtitle
tests/ref/fate/sub-aqtitle
+1
-1
sub-charenc
tests/ref/fate/sub-charenc
+1
-1
sub-jacosub
tests/ref/fate/sub-jacosub
+1
-1
sub-microdvd
tests/ref/fate/sub-microdvd
+1
-1
sub-movtext
tests/ref/fate/sub-movtext
+1
-1
sub-mpl2
tests/ref/fate/sub-mpl2
+1
-1
sub-mpsub
tests/ref/fate/sub-mpsub
+1
-1
sub-mpsub-frames
tests/ref/fate/sub-mpsub-frames
+1
-1
sub-pjs
tests/ref/fate/sub-pjs
+1
-1
sub-realtext
tests/ref/fate/sub-realtext
+1
-1
sub-sami
tests/ref/fate/sub-sami
+1
-1
sub-srt
tests/ref/fate/sub-srt
+1
-1
sub-subviewer
tests/ref/fate/sub-subviewer
+1
-1
sub-subviewer1
tests/ref/fate/sub-subviewer1
+1
-1
sub-vplayer
tests/ref/fate/sub-vplayer
+1
-1
sub-webvtt
tests/ref/fate/sub-webvtt
+1
-1
No files found.
libavcodec/ass.c
View file @
88514378
...
...
@@ -34,9 +34,9 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
{
avctx
->
subtitle_header
=
av_asprintf
(
"[Script Info]
\r\n
"
"ScriptType: v4.00+
\r\n
"
"PlayResX: 384
\r\n
"
"PlayResY: 288
\r\n
"
"ScriptType: v4.00+
\r\n
"
"
\r\n
"
"[V4+ Styles]
\r\n
"
"Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding
\r\n
"
...
...
tests/ref/fate/sub-aqtitle
View file @
88514378
2603c926b8b235032762ef2ae47a7779
47834efc39225264e705dfb885f57df2
tests/ref/fate/sub-charenc
View file @
88514378
6ae00c6970e873d82ef5d06d40e144fe
c088c2924fd7af0a53eeeeb54a3f4456
tests/ref/fate/sub-jacosub
View file @
88514378
5547b430172107fc242385e9c639fa93
3bf9f062bd9825c7d8c3b62451b6d360
tests/ref/fate/sub-microdvd
View file @
88514378
c150177fc8bb928b51de3533fd105225
1741d6776462277430d5e320157f5bf9
tests/ref/fate/sub-movtext
View file @
88514378
ac8c13bac8e0e43c84eaa525680964f0
24c02caa25c6a82d803171697a10d8f5
tests/ref/fate/sub-mpl2
View file @
88514378
4a7699ff366788a4af6243ab28d2f9ff
28fb7dad61c3394f5edc8b186fdf7dd6
tests/ref/fate/sub-mpsub
View file @
88514378
7d047bdf176d4477c8713e89be5dec8e
2f10577c4e2631e9a50495fa2cc9a985
tests/ref/fate/sub-mpsub-frames
View file @
88514378
ae1dce6321a0eb1bc406ca8660350023
792dab5d9a471e0381e18b705fc408cc
tests/ref/fate/sub-pjs
View file @
88514378
1e188b18693844b3a30e91a650f68e1b
a335eefaf09b3b148e65c757bf41af4d
tests/ref/fate/sub-realtext
View file @
88514378
77103e00504d1e1b3302a990a646ae38
a36977a149ce60eac443e4c9bb329ca2
tests/ref/fate/sub-sami
View file @
88514378
4577f9c289440558026dc426584a06d8
04098faede85ddacb40aa12c798cc0cc
tests/ref/fate/sub-srt
View file @
88514378
5315582436b3381996dca4a767a080a0
be870f5037933b6890d56e614ec4aa75
tests/ref/fate/sub-subviewer
View file @
88514378
0954f324e9c8137d7f50fc705199e9a4
848f774195e873ce71febf35b6c9c541
tests/ref/fate/sub-subviewer1
View file @
88514378
89aa422b7a6cd4dc9beef1b5a67d4aab
040d7880a6621b1661f9d12c5375037f
tests/ref/fate/sub-vplayer
View file @
88514378
d8405387687269f7d763fc324c7c01bb
0bb5d4f72b6dc1b37d2ee7b5579ed87e
tests/ref/fate/sub-webvtt
View file @
88514378
6b915f0a00ab04649f6ce769da0af916
ee266bd7141df4ea11a9447ab038bb6e
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