[FFmpeg-cvslog] r11056 - trunk/libavformat/rmdec.c
rtogni
subversion
Mon Nov 19 01:02:58 CET 2007
Author: rtogni
Date: Mon Nov 19 01:02:58 2007
New Revision: 11056
Log:
Cosmetics
Modified:
trunk/libavformat/rmdec.c
Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c (original)
+++ trunk/libavformat/rmdec.c Mon Nov 19 01:02:58 2007
@@ -501,9 +501,8 @@ static int rm_assemble_video_frame(AVFor
rm->curpic_num = pic_num;
rm->pktpos = url_ftell(pb);
}
- if(type == 2){
+ if(type == 2)
len = FFMIN(len, pos);
- }
if(++rm->cur_slice > rm->slices)
return 1;
@@ -521,7 +520,8 @@ static int rm_assemble_video_frame(AVFor
if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0)
return AVERROR(ENOMEM);
memcpy(pkt->data, rm->videobuf, 1 + 8*rm->cur_slice);
- memcpy(pkt->data + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufpos - 1 - 8*rm->slices);
+ memcpy(pkt->data + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices,
+ rm->videobufpos - 1 - 8*rm->slices);
pkt->pts = AV_NOPTS_VALUE;
pkt->pos = rm->pktpos;
return 0;
More information about the ffmpeg-cvslog
mailing list