mpegtsenc: do not reference the deprecated ffmpeg option 'vbsf' in a log message

[ffmpeg] / libavformat / rmdec.c

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 75240236e8a5d7a34dccaf089759c30350bc5e91..ae6cda386671438775ef7818029bf42d8a8ff102 100644 (file)
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -24,7 +24,6 @@
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "internal.h"
-#include "avio_internal.h"
 #include "riff.h"
 #include "rm.h"
 
@@ -613,7 +612,6 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
     }
     if(type != 1){  // not whole frame
         len2 = get_num(pb, &len);
-        len2 = ffio_limit(pb, len2);
         pos  = get_num(pb, &len);
         pic_num = avio_r8(pb); len--;
     }
@@ -664,7 +662,7 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
     vst->videobufpos += len;
     rm->remaining_len-= len;
 
-    if(type == 2 || (vst->videobufpos) == vst->videobufsize){
+    if (type == 2 || vst->videobufpos == vst->videobufsize) {
         vst->pkt.data[0] = vst->cur_slice-1;
         *pkt= vst->pkt;
         vst->pkt.data= NULL;