Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cosmetics

Browse Source 
Originally committed as revision 11056 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Roberto Togni 17 years ago
parent 69434d2f73
commit e35033e6e3
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavformat/rmdec.c

6
libavformat/rmdec.c
Unescape View File

@ -501,9 +501,8 @@ static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket *
rm->curpic_num = pic_num; rm->curpic_num = pic_num;
rm->pktpos = url_ftell(pb); rm->pktpos = url_ftell(pb);
} }
if(type == 2){ if(type == 2)
len = FFMIN(len, pos); len = FFMIN(len, pos);
}
if(++rm->cur_slice > rm->slices) if(++rm->cur_slice > rm->slices)
return 1; return 1;
@ -521,7 +520,8 @@ static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket *
if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0) if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(pkt->data, rm->videobuf, 1 + 8*rm->cur_slice); 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->pts = AV_NOPTS_VALUE;
pkt->pos = rm->pktpos; pkt->pos = rm->pktpos;
return 0; return 0;

Write Preview
Loading…
Cancel
Save