Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/ass: add FFmpeg signature

Browse Source
pull/89/head
Clément Bœsch 10 years ago
parent d281a87ae3
commit 52b0a0ecaa
18 changed files with 19 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/ass.c
  2. 2
      tests/fate-run.sh
  3. 1
      tests/ref/fate/sub-aqtitle
  4. 1
      tests/ref/fate/sub-charenc
  5. 1
      tests/ref/fate/sub-jacosub
  6. 1
      tests/ref/fate/sub-microdvd
  7. 1
      tests/ref/fate/sub-movtext
  8. 1
      tests/ref/fate/sub-mpl2
  9. 1
      tests/ref/fate/sub-mpsub
  10. 1
      tests/ref/fate/sub-mpsub-frames
  11. 1
      tests/ref/fate/sub-pjs
  12. 1
      tests/ref/fate/sub-realtext
  13. 1
      tests/ref/fate/sub-sami
  14. 1
      tests/ref/fate/sub-srt
  15. 1
      tests/ref/fate/sub-subviewer
  16. 1
      tests/ref/fate/sub-subviewer1
  17. 1
      tests/ref/fate/sub-vplayer
  18. 1
      tests/ref/fate/sub-webvtt

2
libavcodec/ass.c
Unescape View File

@ -34,6 +34,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
{ {
avctx->subtitle_header = av_asprintf( avctx->subtitle_header = av_asprintf(
"[Script Info]\r\n" "[Script Info]\r\n"
"; Script generated by FFmpeg/Lavc%s\r\n"
"ScriptType: v4.00+\r\n" "ScriptType: v4.00+\r\n"
"PlayResX: 384\r\n" "PlayResX: 384\r\n"
"PlayResY: 288\r\n" "PlayResY: 288\r\n"
@ -65,6 +66,7 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
"\r\n" "\r\n"
"[Events]\r\n" "[Events]\r\n"
"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\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, font, font_size, color, color, back_color, back_color,
-bold, -italic, -underline, alignment); -bold, -italic, -underline, alignment);

2
tests/fate-run.sh
Unescape View File

@ -117,7 +117,7 @@ pcm(){
fmtstdout(){ fmtstdout(){
fmt=$1 fmt=$1
shift 1 shift 1
ffmpeg "$@" -f $fmt - ffmpeg -flags +bitexact "$@" -f $fmt -
} }
enc_dec_pcm(){ enc_dec_pcm(){

1
tests/ref/fate/sub-aqtitle
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-charenc
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-jacosub
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-microdvd
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-movtext
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-mpl2
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-mpsub
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-mpsub-frames
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-pjs
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-realtext
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-sami
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-srt
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-subviewer
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-subviewer1
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-vplayer
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

1
tests/ref/fate/sub-webvtt
Unescape View File

@ -1,4 +1,5 @@
[Script Info] [Script Info]
; Script generated by FFmpeg/Lavc
ScriptType: v4.00+ ScriptType: v4.00+
PlayResX: 384 PlayResX: 384
PlayResY: 288 PlayResY: 288

Write Preview
Loading…
Cancel
Save