virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'

Browse Source 
* commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f':
  tscc: Eliminate pointless variable indirections in decode_frame()

Conflicts:
	libavcodec/tscc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-01 16:34:20 +02:00
commit 79d0e164cf
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/tscc.c
View File

@ -68,32 +68,30 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
CamtasiaContext * const c = avctx->priv_data; CamtasiaContext * const c = avctx->priv_data;
const unsigned char *encoded = buf;
AVFrame *frame = c->frame; AVFrame *frame = c->frame;
int zret; // Zlib return code int ret;
int ret, len = buf_size;
if ((ret = ff_reget_buffer(avctx, frame)) < 0) if ((ret = ff_reget_buffer(avctx, frame)) < 0)
return ret; return ret;
zret = inflateReset(&c->zstream); ret = inflateReset(&c->zstream);
if (zret != Z_OK) { if (ret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret);
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
c->zstream.next_in = (uint8_t*)encoded; c->zstream.next_in = buf;
c->zstream.avail_in = len; c->zstream.avail_in = buf_size;
c->zstream.next_out = c->decomp_buf; c->zstream.next_out = c->decomp_buf;
c->zstream.avail_out = c->decomp_size; c->zstream.avail_out = c->decomp_size;
zret = inflate(&c->zstream, Z_FINISH); ret = inflate(&c->zstream, Z_FINISH);
// Z_DATA_ERROR means empty picture // Z_DATA_ERROR means empty picture
if ((zret != Z_OK) && (zret != Z_STREAM_END) && (zret != Z_DATA_ERROR)) { if ((ret != Z_OK) && (ret != Z_STREAM_END) && (ret != Z_DATA_ERROR)) {
av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret);
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
if (zret != Z_DATA_ERROR) { if (ret != Z_DATA_ERROR) {
bytestream2_init(&c->gb, c->decomp_buf, bytestream2_init(&c->gb, c->decomp_buf,
c->decomp_size - c->zstream.avail_out); c->decomp_size - c->zstream.avail_out);
ff_msrle_decode(avctx, (AVPicture*)frame, c->bpp, &c->gb); ff_msrle_decode(avctx, (AVPicture*)frame, c->bpp, &c->gb);