[FFmpeg-cvslog] avcodec/ass: explicit PlayRes[XY]

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 18 18:12:11 2014 +0200| [5039aadf68deb9ad6dd0737ea11259fe53d3727b] | committer: Clément Bœsch

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5039aadf68deb9ad6dd0737ea11259fe53d3727b
---

 libavcodec/ass.c                |    2 ++
 tests/ref/fate/sub-aqtitle      |    2 +-
 tests/ref/fate/sub-charenc      |    2 +-
 tests/ref/fate/sub-jacosub      |    2 +-
 tests/ref/fate/sub-microdvd     |    2 +-
 tests/ref/fate/sub-movtext      |    2 +-
 tests/ref/fate/sub-mpl2         |    2 +-
 tests/ref/fate/sub-mpsub        |    2 +-
 tests/ref/fate/sub-mpsub-frames |    2 +-
 tests/ref/fate/sub-pjs          |    2 +-
 tests/ref/fate/sub-realtext     |    2 +-
 tests/ref/fate/sub-sami         |    2 +-
 tests/ref/fate/sub-srt          |    2 +-
 tests/ref/fate/sub-subviewer    |    2 +-
 tests/ref/fate/sub-subviewer1   |    2 +-
 tests/ref/fate/sub-vplayer      |    2 +-
 tests/ref/fate/sub-webvtt       |    2 +-
 17 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index ccc9570..4edff84 100644
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -34,6 +34,8 @@ int ff_ass_subtitle_header(AVCodecContext *avctx,
 {
     avctx->subtitle_header = av_asprintf(
              "[Script Info]\r\n"
+             "PlayResX: 384\r\n"
+             "PlayResY: 288\r\n"
              "ScriptType: v4.00+\r\n"
              "\r\n"
              "[V4+ Styles]\r\n"
diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle
index c477b0a..0d04c9d 100644
--- a/tests/ref/fate/sub-aqtitle
+++ b/tests/ref/fate/sub-aqtitle
@@ -1 +1 @@
-1c68def68db6536c235819cbe0638e00
+2603c926b8b235032762ef2ae47a7779
diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc
index ef72754..a5a54e9 100644
--- a/tests/ref/fate/sub-charenc
+++ b/tests/ref/fate/sub-charenc
@@ -1 +1 @@
-9615088d613931b50fd5016c7535b99a
+6ae00c6970e873d82ef5d06d40e144fe
diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub
index b65aee2..9802484 100644
--- a/tests/ref/fate/sub-jacosub
+++ b/tests/ref/fate/sub-jacosub
@@ -1 +1 @@
-4e8f2d1d4130251163432d2a448680be
+5547b430172107fc242385e9c639fa93
diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd
index 2059989..1dff1a5 100644
--- a/tests/ref/fate/sub-microdvd
+++ b/tests/ref/fate/sub-microdvd
@@ -1 +1 @@
-35e133576aa3881d2de8dbf39a8d6df7
+c150177fc8bb928b51de3533fd105225
diff --git a/tests/ref/fate/sub-movtext b/tests/ref/fate/sub-movtext
index d91c243..5409dec 100644
--- a/tests/ref/fate/sub-movtext
+++ b/tests/ref/fate/sub-movtext
@@ -1 +1 @@
-21453e8ddbbe35d1368a99fe563c969d
+ac8c13bac8e0e43c84eaa525680964f0
diff --git a/tests/ref/fate/sub-mpl2 b/tests/ref/fate/sub-mpl2
index 8835dd2..37a9391 100644
--- a/tests/ref/fate/sub-mpl2
+++ b/tests/ref/fate/sub-mpl2
@@ -1 +1 @@
-3c2fb62002aec3af16d83135a0e3b0fc
+4a7699ff366788a4af6243ab28d2f9ff
diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub
index 4e36648..b0f5db5 100644
--- a/tests/ref/fate/sub-mpsub
+++ b/tests/ref/fate/sub-mpsub
@@ -1 +1 @@
-2c5fafec41479e1d09a32f85e8927d03
+7d047bdf176d4477c8713e89be5dec8e
diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames
index d5bb44e..4a336c4 100644
--- a/tests/ref/fate/sub-mpsub-frames
+++ b/tests/ref/fate/sub-mpsub-frames
@@ -1 +1 @@
-cbe6e45848ef77e3080487a88b122104
+ae1dce6321a0eb1bc406ca8660350023
diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs
index 8b382e7..9457271 100644
--- a/tests/ref/fate/sub-pjs
+++ b/tests/ref/fate/sub-pjs
@@ -1 +1 @@
-d044f6ffdee48e48efff072b33baee0a
+1e188b18693844b3a30e91a650f68e1b
diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext
index 42ac3bb..079a664 100644
--- a/tests/ref/fate/sub-realtext
+++ b/tests/ref/fate/sub-realtext
@@ -1 +1 @@
-5366f62be001f6fd4a7f48893828bf51
+77103e00504d1e1b3302a990a646ae38
diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami
index 308e000..0d72ca0 100644
--- a/tests/ref/fate/sub-sami
+++ b/tests/ref/fate/sub-sami
@@ -1 +1 @@
-00642e143339b4ca29dc6e990436387c
+4577f9c289440558026dc426584a06d8
diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt
index ba5e50a..66ba339 100644
--- a/tests/ref/fate/sub-srt
+++ b/tests/ref/fate/sub-srt
@@ -1 +1 @@
-a246a00ed72655cb8db3eaf64a522e0d
+5315582436b3381996dca4a767a080a0
diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer
index abae1f7..c7e4628 100644
--- a/tests/ref/fate/sub-subviewer
+++ b/tests/ref/fate/sub-subviewer
@@ -1 +1 @@
-aef995d49af4517b40589b72cfa918f7
+0954f324e9c8137d7f50fc705199e9a4
diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1
index 052431a..c617537 100644
--- a/tests/ref/fate/sub-subviewer1
+++ b/tests/ref/fate/sub-subviewer1
@@ -1 +1 @@
-cbeb015b1125757eed814f212cfc6c9c
+89aa422b7a6cd4dc9beef1b5a67d4aab
diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer
index b8fc40e..8077d5b 100644
--- a/tests/ref/fate/sub-vplayer
+++ b/tests/ref/fate/sub-vplayer
@@ -1 +1 @@
-c8201c542f43a9ea42a787ac74d28049
+d8405387687269f7d763fc324c7c01bb
diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt
index 45cccde..dc1bef6 100644
--- a/tests/ref/fate/sub-webvtt
+++ b/tests/ref/fate/sub-webvtt
@@ -1 +1 @@
-2cf38e2c99f8717f78a91a3f31197fb4
+6b915f0a00ab04649f6ce769da0af916