1. ffmpeg
  2. Commit 5039aadf68deb9ad6dd0737ea11259fe53d3727b
Browse code

avcodec/ass: explicit PlayRes[XY]

This avoids the following libass warning when using the subtitles
filter: "Neither PlayResX nor PlayResY defined. Assuming 384x288"

Subtitles tests change because the output is ASS and the PlayRes[XY]
ends up in the output.

Clément Bœsch authored on 2014/06/19 01:12:11
Showing 17 changed files
libavcodec/ass.c
History View file @ 5039aad
... ... 
@@ -34,6 +34,8 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
34 34 
 {
35 35 
     avctx->subtitle_header = av_asprintf(
36 36 
              "[Script Info]\r\n"
37 
+             "PlayResX: 384\r\n"
38 
+             "PlayResY: 288\r\n"
37 39 
              "ScriptType: v4.00+\r\n"
38 40 
              "\r\n"
39 41 
              "[V4+ Styles]\r\n"
tests/ref/fate/sub-aqtitle
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-1c68def68db6536c235819cbe0638e00
1 
+2603c926b8b235032762ef2ae47a7779
tests/ref/fate/sub-charenc
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-9615088d613931b50fd5016c7535b99a
1 
+6ae00c6970e873d82ef5d06d40e144fe
tests/ref/fate/sub-jacosub
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-4e8f2d1d4130251163432d2a448680be
1 
+5547b430172107fc242385e9c639fa93
tests/ref/fate/sub-microdvd
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-35e133576aa3881d2de8dbf39a8d6df7
1 
+c150177fc8bb928b51de3533fd105225
tests/ref/fate/sub-movtext
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-21453e8ddbbe35d1368a99fe563c969d
1 
+ac8c13bac8e0e43c84eaa525680964f0
tests/ref/fate/sub-mpl2
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-3c2fb62002aec3af16d83135a0e3b0fc
1 
+4a7699ff366788a4af6243ab28d2f9ff
tests/ref/fate/sub-mpsub
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-2c5fafec41479e1d09a32f85e8927d03
1 
+7d047bdf176d4477c8713e89be5dec8e
tests/ref/fate/sub-mpsub-frames
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-cbe6e45848ef77e3080487a88b122104
1 
+ae1dce6321a0eb1bc406ca8660350023
tests/ref/fate/sub-pjs
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-d044f6ffdee48e48efff072b33baee0a
1 
+1e188b18693844b3a30e91a650f68e1b
tests/ref/fate/sub-realtext
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-5366f62be001f6fd4a7f48893828bf51
1 
+77103e00504d1e1b3302a990a646ae38
tests/ref/fate/sub-sami
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-00642e143339b4ca29dc6e990436387c
1 
+4577f9c289440558026dc426584a06d8
tests/ref/fate/sub-srt
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-a246a00ed72655cb8db3eaf64a522e0d
1 
+5315582436b3381996dca4a767a080a0
tests/ref/fate/sub-subviewer
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-aef995d49af4517b40589b72cfa918f7
1 
+0954f324e9c8137d7f50fc705199e9a4
tests/ref/fate/sub-subviewer1
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-cbeb015b1125757eed814f212cfc6c9c
1 
+89aa422b7a6cd4dc9beef1b5a67d4aab
tests/ref/fate/sub-vplayer
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-c8201c542f43a9ea42a787ac74d28049
1 
+d8405387687269f7d763fc324c7c01bb
tests/ref/fate/sub-webvtt
History View file @ 5039aad
... ... 
@@ -1 +1 @@
1 
-2cf38e2c99f8717f78a91a3f31197fb4
1 
+6b915f0a00ab04649f6ce769da0af916