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
52b0a0ec
Commit
52b0a0ec
authored
Oct 11, 2014
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ass: add FFmpeg signature
parent
d281a87a
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
19 additions
and
1 deletion
+19
-1
ass.c
libavcodec/ass.c
+2
-0
fate-run.sh
tests/fate-run.sh
+1
-1
sub-aqtitle
tests/ref/fate/sub-aqtitle
+1
-0
sub-charenc
tests/ref/fate/sub-charenc
+1
-0
sub-jacosub
tests/ref/fate/sub-jacosub
+1
-0
sub-microdvd
tests/ref/fate/sub-microdvd
+1
-0
sub-movtext
tests/ref/fate/sub-movtext
+1
-0
sub-mpl2
tests/ref/fate/sub-mpl2
+1
-0
sub-mpsub
tests/ref/fate/sub-mpsub
+1
-0
sub-mpsub-frames
tests/ref/fate/sub-mpsub-frames
+1
-0
sub-pjs
tests/ref/fate/sub-pjs
+1
-0
sub-realtext
tests/ref/fate/sub-realtext
+1
-0
sub-sami
tests/ref/fate/sub-sami
+1
-0
sub-srt
tests/ref/fate/sub-srt
+1
-0
sub-subviewer
tests/ref/fate/sub-subviewer
+1
-0
sub-subviewer1
tests/ref/fate/sub-subviewer1
+1
-0
sub-vplayer
tests/ref/fate/sub-vplayer
+1
-0
sub-webvtt
tests/ref/fate/sub-webvtt
+1
-0
No files found.
libavcodec/ass.c
View file @
52b0a0ec
...
...
@@ -34,6 +34,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
{
avctx
->
subtitle_header
=
av_asprintf
(
"[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
"
...
...
@@ -65,6 +66,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
"
\r\n
"
"[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
)
:
""
,
font
,
font_size
,
color
,
color
,
back_color
,
back_color
,
-
bold
,
-
italic
,
-
underline
,
alignment
);
...
...
tests/fate-run.sh
View file @
52b0a0ec
...
...
@@ -117,7 +117,7 @@ pcm(){
fmtstdout
(){
fmt
=
$1
shift
1
ffmpeg
"
$@
"
-f
$fmt
-
ffmpeg
-flags
+bitexact
"
$@
"
-f
$fmt
-
}
enc_dec_pcm
(){
...
...
tests/ref/fate/sub-aqtitle
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-charenc
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-jacosub
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-microdvd
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-movtext
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-mpl2
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-mpsub
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-mpsub-frames
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-pjs
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-realtext
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-sami
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-srt
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-subviewer
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-subviewer1
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-vplayer
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
tests/ref/fate/sub-webvtt
View file @
52b0a0ec
[Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+
PlayResX: 384
PlayResY: 288
...
...
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