History

avcodec/ass: move playres parameters below scripttype

Clément Bœsch committed 12 years ago

Commit 88514371 parent 5039aad17 files · +17 −17Browse files

Unified · Split

17 files
  1. libavcodec/ass.c +1 −1
  2. tests/ref/fate/sub-aqtitle +1 −1
  3. tests/ref/fate/sub-charenc +1 −1
  4. tests/ref/fate/sub-jacosub +1 −1
  5. tests/ref/fate/sub-microdvd +1 −1
  6. tests/ref/fate/sub-movtext +1 −1
  7. tests/ref/fate/sub-mpl2 +1 −1
  8. tests/ref/fate/sub-mpsub +1 −1
  9. tests/ref/fate/sub-mpsub-frames +1 −1
  10. tests/ref/fate/sub-pjs +1 −1
  11. tests/ref/fate/sub-realtext +1 −1
  12. tests/ref/fate/sub-sami +1 −1
  13. tests/ref/fate/sub-srt +1 −1
  14. tests/ref/fate/sub-subviewer +1 −1
  15. tests/ref/fate/sub-subviewer1 +1 −1
  16. tests/ref/fate/sub-vplayer +1 −1
  17. tests/ref/fate/sub-webvtt +1 −1
libavcodec/ass.c+1−1
@@ -34,9 +34,9 @@ int ff_ass_subtitle_header(AVCodecContext *avctx, · 33 unmodified lines
3434 {
3535 avctx->subtitle_header = av_asprintf(
3636 "[Script Info]\r\n"
37+ "ScriptType: v4.00+\r\n"
3738 "PlayResX: 384\r\n"
3839 "PlayResY: 288\r\n"
39− "ScriptType: v4.00+\r\n"
4040 "\r\n"
4141 "[V4+ Styles]\r\n"
4242 "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+1−1
@@ -1 +1 @@
1−2603c926b8b235032762ef2ae47a7779
1+47834efc39225264e705dfb885f57df2
tests/ref/fate/sub-charenc+1−1
@@ -1 +1 @@
1−6ae00c6970e873d82ef5d06d40e144fe
1+c088c2924fd7af0a53eeeeb54a3f4456
tests/ref/fate/sub-jacosub+1−1
@@ -1 +1 @@
1−5547b430172107fc242385e9c639fa93
1+3bf9f062bd9825c7d8c3b62451b6d360
tests/ref/fate/sub-microdvd+1−1
@@ -1 +1 @@
1−c150177fc8bb928b51de3533fd105225
1+1741d6776462277430d5e320157f5bf9
tests/ref/fate/sub-movtext+1−1
@@ -1 +1 @@
1−ac8c13bac8e0e43c84eaa525680964f0
1+24c02caa25c6a82d803171697a10d8f5
tests/ref/fate/sub-mpl2+1−1
@@ -1 +1 @@
1−4a7699ff366788a4af6243ab28d2f9ff
1+28fb7dad61c3394f5edc8b186fdf7dd6
tests/ref/fate/sub-mpsub+1−1
@@ -1 +1 @@
1−7d047bdf176d4477c8713e89be5dec8e
1+2f10577c4e2631e9a50495fa2cc9a985
tests/ref/fate/sub-mpsub-frames+1−1
@@ -1 +1 @@
1−ae1dce6321a0eb1bc406ca8660350023
1+792dab5d9a471e0381e18b705fc408cc
tests/ref/fate/sub-pjs+1−1
@@ -1 +1 @@
1−1e188b18693844b3a30e91a650f68e1b
1+a335eefaf09b3b148e65c757bf41af4d
tests/ref/fate/sub-realtext+1−1
@@ -1 +1 @@
1−77103e00504d1e1b3302a990a646ae38
1+a36977a149ce60eac443e4c9bb329ca2
tests/ref/fate/sub-sami+1−1
@@ -1 +1 @@
1−4577f9c289440558026dc426584a06d8
1+04098faede85ddacb40aa12c798cc0cc
tests/ref/fate/sub-srt+1−1
@@ -1 +1 @@
1−5315582436b3381996dca4a767a080a0
1+be870f5037933b6890d56e614ec4aa75
tests/ref/fate/sub-subviewer+1−1
@@ -1 +1 @@
1−0954f324e9c8137d7f50fc705199e9a4
1+848f774195e873ce71febf35b6c9c541
tests/ref/fate/sub-subviewer1+1−1
@@ -1 +1 @@
1−89aa422b7a6cd4dc9beef1b5a67d4aab
1+040d7880a6621b1661f9d12c5375037f
tests/ref/fate/sub-vplayer+1−1
@@ -1 +1 @@
1−d8405387687269f7d763fc324c7c01bb
1+0bb5d4f72b6dc1b37d2ee7b5579ed87e
tests/ref/fate/sub-webvtt+1−1
@@ -1 +1 @@
1−6b915f0a00ab04649f6ce769da0af916
1+ee266bd7141df4ea11a9447ab038bb6e

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t