diff options
| author | Roberto Togni <r_togni@tiscali.it> | 2007-11-19 00:02:58 +0000 |
|---|---|---|
| committer | Roberto Togni <r_togni@tiscali.it> | 2007-11-19 00:02:58 +0000 |
| commit | e35033e6e33be017306fb9c84cd44326bb5f8d1f (patch) | |
| tree | e8da017cd91eb49181fd129cc7c48d05c2fd5e63 | |
| parent | 69434d2f73fd2418936f90276a0989ea9520ab05 (diff) | |
| download | ffmpeg-e35033e6e33be017306fb9c84cd44326bb5f8d1f.tar.gz | |
Cosmetics
Originally committed as revision 11056 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rmdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 69660eda78..4cc4a34df0 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -501,9 +501,8 @@ static int rm_assemble_video_frame(AVFormatContext *s, RMContext *rm, AVPacket * 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(AVFormatContext *s, RMContext *rm, AVPacket * 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; |