RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'stev47/master'

Browse Source 
* stev47/master:
  cpia: move reget_buffer after header check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-01 14:22:58 +02:00
commit 75a4b91f83
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/cpia.c
View File

@ -61,12 +61,6 @@ static int cpia_decode_frame(AVCodecContext* avctx,
AVFrame* const frame = &cpia->frame; AVFrame* const frame = &cpia->frame;
uint8_t *y, *u, *v, *y_end, *u_end, *v_end; uint8_t *y, *u, *v, *y_end, *u_end, *v_end;
// Get buffer filled with previous frame
if ((ret = avctx->reget_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed!\n");
return ret;
}
// Check header // Check header
if ( avpkt->size < FRAME_HEADER_SIZE if ( avpkt->size < FRAME_HEADER_SIZE
|| header[0] != MAGIC_0 || header[1] != MAGIC_1 || header[0] != MAGIC_0 || header[1] != MAGIC_1
@ -104,6 +98,12 @@ static int cpia_decode_frame(AVCodecContext* avctx,
frame->key_frame = 0; frame->key_frame = 0;
} }
// Get buffer filled with previous frame
if ((ret = avctx->reget_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed!\n");
return ret;
}
for ( i = 0; for ( i = 0;
i < frame->height; i < frame->height;