[FFmpeg-devel] libavcodec/dvbsubdec: Fix for ticket 6796 (ffprobe show_frames ts dvbsubs infinite loop)

Submitted by Colin NG on Dec. 4, 2017, 2:54 a.m.

Details

Message ID DM5PR22MB06819A59DCB12DC7D623554EFE3C0@DM5PR22MB0681.namprd22.prod.outlook.com
State New
Headers show

Commit Message

Colin NG Dec. 4, 2017, 2:54 a.m.
---
 libavcodec/dvbsubdec.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Moritz Barsnick Dec. 4, 2017, 9:48 a.m.
On Mon, Dec 04, 2017 at 02:54:13 +0000, Colin NG wrote:

> libavcodec/dvbsubdec: Fix for ticket 6796 (ffprobe show_frames ts dvbsubs infinite loop)

Same comment as to the other patch's commit message.

Furthermore: Didn't the other patch already claim to fix #6796? If not,
you need to say "partially fixes".

That said:

>  static int dvbsub_decode(AVCodecContext *avctx,
> -                         void *data, int *data_size,
> +                         void *data, int *got_output,
>                           AVPacket *avpkt)

Do I see it correctly that you are only renaming one variable? Then
please say so in the commit message, and don't claim that it fixes
anything.

Moritz

Patch hide | download patch | download mbox

diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index a657b1d..29997a2 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -1596,7 +1596,7 @@  static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
 }
 
 static int dvbsub_decode(AVCodecContext *avctx,
-                         void *data, int *data_size,
+                         void *data, int *got_output,
                          AVPacket *avpkt)
 {
     const uint8_t *buf = avpkt->data;
@@ -1654,7 +1654,7 @@  static int dvbsub_decode(AVCodecContext *avctx,
             int ret = 0;
             switch (segment_type) {
             case DVBSUB_PAGE_SEGMENT:
-                ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, data_size);
+                ret = dvbsub_parse_page_segment(avctx, p, segment_length, sub, got_output);
                 got_segment |= 1;
                 break;
             case DVBSUB_REGION_SEGMENT:
@@ -1676,7 +1676,7 @@  static int dvbsub_decode(AVCodecContext *avctx,
                 got_dds = 1;
                 break;
             case DVBSUB_DISPLAY_SEGMENT:
-                ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, data_size);
+                ret = dvbsub_display_end_segment(avctx, p, segment_length, sub, got_output);
                 if (got_segment == 15 && !got_dds && !avctx->width && !avctx->height) {
                     // Default from ETSI EN 300 743 V1.3.1 (7.2.1)
                     avctx->width  = 720;
@@ -1699,12 +1699,12 @@  static int dvbsub_decode(AVCodecContext *avctx,
     // segments then we need no further data.
     if (got_segment == 15) {
         av_log(avctx, AV_LOG_DEBUG, "Missing display_end_segment, emulating\n");
-        dvbsub_display_end_segment(avctx, p, 0, sub, data_size);
+        dvbsub_display_end_segment(avctx, p, 0, sub, got_output);
     }
 
 end:
     if(ret < 0) {
-        *data_size = 0;
+        *got_output = 0;
         avsubtitle_free(sub);
         return ret;
     } else {