dvbsub: fix encoding of termination packets.

The old code generates a termination packet with the same regions as the
start packet and page_state set to "only what changed"; the result is
that the termination packet is decoded as identical to the start packet.

The new code does as found in some DVB broadcasts: produce a packet with
no regions. This is done by expecting num_rects to be 0 rather than
using a flip-flop. ffmpeg.c is updated accordingly.
This commit is contained in:
Nicolas George
2012-07-25 19:45:16 +02:00
parent cc650cf029
commit aed032c25b
2 changed files with 7 additions and 11 deletions

View File

@@ -703,6 +703,8 @@ static void do_subtitle_out(AVFormatContext *s,
sub->pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
sub->end_display_time -= sub->start_display_time;
sub->start_display_time = 0;
if (i == 1)
sub->num_rects = 0;
subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
subtitle_out_max_size, sub);
if (subtitle_out_size < 0) {