Originally committed as revision 2733 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -110,8 +110,8 @@ static void msrle_decode_pal4(MsrleContext *s) | |||||
| FETCH_NEXT_STREAM_BYTE(); | FETCH_NEXT_STREAM_BYTE(); | ||||
| s->frame.data[0][row_ptr + pixel_ptr] = stream_byte >> 4; | s->frame.data[0][row_ptr + pixel_ptr] = stream_byte >> 4; | ||||
| pixel_ptr++; | pixel_ptr++; | ||||
| if (i + 1 == rle_code && odd_pixel) | |||||
| break; | |||||
| if (i + 1 == rle_code && odd_pixel) | |||||
| break; | |||||
| if (pixel_ptr >= s->avctx->width) | if (pixel_ptr >= s->avctx->width) | ||||
| break; | break; | ||||
| s->frame.data[0][row_ptr + pixel_ptr] = stream_byte & 0x0F; | s->frame.data[0][row_ptr + pixel_ptr] = stream_byte & 0x0F; | ||||
| @@ -254,9 +254,9 @@ static int msrle_decode_frame(AVCodecContext *avctx, | |||||
| { | { | ||||
| MsrleContext *s = (MsrleContext *)avctx->priv_data; | MsrleContext *s = (MsrleContext *)avctx->priv_data; | ||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| s->buf = buf; | s->buf = buf; | ||||
| s->size = buf_size; | s->size = buf_size; | ||||
| @@ -303,15 +303,15 @@ static int msvideo1_decode_frame(AVCodecContext *avctx, | |||||
| { | { | ||||
| Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data; | Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data; | ||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| s->buf = buf; | s->buf = buf; | ||||
| s->size = buf_size; | s->size = buf_size; | ||||
| s->frame.reference = 1; | |||||
| s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; | |||||
| s->frame.reference = 1; | |||||
| s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; | |||||
| if (avctx->reget_buffer(avctx, &s->frame)) { | if (avctx->reget_buffer(avctx, &s->frame)) { | ||||
| av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | ||||
| return -1; | return -1; | ||||
| @@ -254,15 +254,15 @@ static int rpza_decode_frame(AVCodecContext *avctx, | |||||
| { | { | ||||
| RpzaContext *s = (RpzaContext *)avctx->priv_data; | RpzaContext *s = (RpzaContext *)avctx->priv_data; | ||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| s->buf = buf; | s->buf = buf; | ||||
| s->size = buf_size; | s->size = buf_size; | ||||
| s->frame.reference = 1; | s->frame.reference = 1; | ||||
| s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; | |||||
| s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; | |||||
| if (avctx->reget_buffer(avctx, &s->frame)) { | if (avctx->reget_buffer(avctx, &s->frame)) { | ||||
| av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | ||||
| return -1; | return -1; | ||||
| @@ -453,16 +453,16 @@ static int smc_decode_frame(AVCodecContext *avctx, | |||||
| { | { | ||||
| SmcContext *s = (SmcContext *)avctx->priv_data; | SmcContext *s = (SmcContext *)avctx->priv_data; | ||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| /* no supplementary picture */ | |||||
| if (buf_size == 0) | |||||
| return 0; | |||||
| s->buf = buf; | s->buf = buf; | ||||
| s->size = buf_size; | s->size = buf_size; | ||||
| s->frame.reference = 1; | s->frame.reference = 1; | ||||
| s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | | |||||
| FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; | |||||
| s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | | |||||
| FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; | |||||
| if (avctx->reget_buffer(avctx, &s->frame)) { | if (avctx->reget_buffer(avctx, &s->frame)) { | ||||
| printf ("reget_buffer() failed\n"); | printf ("reget_buffer() failed\n"); | ||||
| return -1; | return -1; | ||||