[FFmpeg-cvslog] avcodec/microdvddec: remove old compat code

Clément Bœsch git at videolan.org
Sat Sep 27 17:55:49 CEST 2014


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Sep 20 22:30:11 2014 +0200| [180d7f330bd99ba17ba65dcd44e3918892f1f275] | committer: Clément Bœsch

avcodec/microdvddec: remove old compat code

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=180d7f330bd99ba17ba65dcd44e3918892f1f275
---

 libavcodec/microdvddec.c |   10 ----------
 1 file changed, 10 deletions(-)

diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c
index 1347510..dda7f81 100644
--- a/libavcodec/microdvddec.c
+++ b/libavcodec/microdvddec.c
@@ -260,7 +260,6 @@ static int microdvd_decode_frame(AVCodecContext *avctx,
 {
     AVSubtitle *sub = data;
     AVBPrint new_line;
-    char c;
     char *line = avpkt->data;
     char *end = avpkt->data + avpkt->size;
     struct microdvd_tag tags[sizeof(MICRODVD_TAGS) - 1] = {{0}};
@@ -268,15 +267,6 @@ static int microdvd_decode_frame(AVCodecContext *avctx,
     if (avpkt->size <= 0)
         return avpkt->size;
 
-    /* To be removed later */
-    if (sscanf(line, "{%*d}{%*[0123456789]}%c", &c) == 1 &&
-        line[avpkt->size - 1] == '\n') {
-        av_log(avctx, AV_LOG_ERROR, "AVPacket is not clean (contains timing "
-               "information and a trailing line break). You need to upgrade "
-               "your libavformat or sanitize your packet.\n");
-        return AVERROR_INVALIDDATA;
-    }
-
     av_bprint_init(&new_line, 0, 2048);
 
     // subtitle content



More information about the ffmpeg-cvslog mailing list