lavc/srtenc: do not add trailing line breaks with SubRip.

The SRT muxer is reponsible for separating events with two line breaks,
there is no need to add more than necessary. Similarly, other muxers
(such as Matroska) are not supposed to add line breaks at the end of the
payload.
pull/8/head
Clément Bœsch 12 years ago
parent 3af3a3006f
commit 1b673cd9ff
  1. 5
      libavcodec/srtenc.c
  2. 2
      tests/ref/fate/sub-subripenc

@ -218,8 +218,11 @@ static void srt_move_cb(void *priv, int x1, int y1, int x2, int y2,
static void srt_end_cb(void *priv)
{
SRTContext *s = priv;
srt_stack_push_pop(priv, 0, 1);
srt_print(priv, "\r\n\r\n");
if (s->avctx->codec->id == AV_CODEC_ID_SRT)
srt_print(priv, "\r\n\r\n");
}
static const ASSCodesCallbacks srt_callbacks = {

@ -1 +1 @@
bd520f85238abf9df292374aed54681a
b7cb0eeb34af0da364e29b238f0634ae

Loading…
Cancel
Save