virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mmvideo: count preamble size in return value.

Browse Source 
MM_PREAMBLE_SIZE is subtracted from buf_size almost immediately.
The original size is still in avpkt->size.
This commit is contained in:
Nicolas George 2012-07-28 19:36:21 +02:00
parent cc7eff1fa0
commit 3d5dc7d87d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mmvideo.c
View File

@ -194,7 +194,7 @@ static int mm_decode_frame(AVCodecContext *avctx,
}
switch(type) {
case MM_TYPE_PALETTE : res = mm_decode_pal(s); return buf_size;
case MM_TYPE_PALETTE : res = mm_decode_pal(s); return avpkt->size;
case MM_TYPE_INTRA : res = mm_decode_intra(s, 0, 0); break;
case MM_TYPE_INTRA_HH : res = mm_decode_intra(s, 1, 0); break;
case MM_TYPE_INTRA_HHV : res = mm_decode_intra(s, 1, 1); break;
@ -213,7 +213,7 @@ static int mm_decode_frame(AVCodecContext *avctx,
*data_size = sizeof(AVFrame);
*(AVFrame*)data = s->frame;
return buf_size;
return avpkt->size;
}
static av_cold int mm_decode_end(AVCodecContext *avctx)