diff options
| author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
| commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
| tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /sub/sd_lavc_conv.c | |
| parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
| parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
| download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz | |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'sub/sd_lavc_conv.c')
| -rw-r--r-- | sub/sd_lavc_conv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c index 1fc0262f96..4f24e20709 100644 --- a/sub/sd_lavc_conv.c +++ b/sub/sd_lavc_conv.c @@ -87,7 +87,7 @@ static int init(struct sd *sd) avctx->time_base = (AVRational) {1, 1000}; priv->avctx = avctx; sd->priv = priv; - sd->output_codec = "ass"; + sd->output_codec = "ssa"; sd->output_extradata = avctx->subtitle_header; sd->output_extradata_len = avctx->subtitle_header_size; if (sd->output_extradata) { |