From: Michael Niedermayer <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/zerocodec.c | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
index 3bf1fd9..6bfa5d2 100644
--- a/libavcodec/zerocodec.c
+++ b/libavcodec/zerocodec.c
@@ -62,49 +62,32 @@ static int zerocodec_decode_frame(AVCodecContext *avctx,
void *data,
*/
if (avpkt->flags & AV_PKT_FLAG_KEY) {
-
pic->key_frame = 1;
pic->pict_type = AV_PICTURE_TYPE_I;
-
- for (i = 0; i < avctx->height; i++) {
-
- zstream->next_out = dst;
- zstream->avail_out = avctx->width << 1;
-
- zret = inflate(zstream, Z_SYNC_FLUSH);
-
- if (zret != Z_OK && zret != Z_STREAM_END) {
- av_log(avctx, AV_LOG_ERROR,
- "Inflate failed with return code: %d\n", zret);
- return AVERROR(EINVAL);
- }
-
- dst += pic->linesize[0];
- }
} else {
-
pic->key_frame = 0;
pic->pict_type = AV_PICTURE_TYPE_P;
+ }
- for (i = 0; i < avctx->height; i++) {
+ for (i = 0; i < avctx->height; i++) {
- zstream->next_out = dst;
- zstream->avail_out = avctx->width << 1;
+ zstream->next_out = dst;
+ zstream->avail_out = avctx->width << 1;
- zret = inflate(zstream, Z_SYNC_FLUSH);
+ zret = inflate(zstream, Z_SYNC_FLUSH);
- if (zret != Z_OK && zret != Z_STREAM_END) {
- av_log(avctx, AV_LOG_ERROR,
- "Inflate failed with return code: %d\n", zret);
- return AVERROR(EINVAL);
- }
+ if (zret != Z_OK && zret != Z_STREAM_END) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Inflate failed with return code: %d\n", zret);
+ return AVERROR(EINVAL);
+ }
+ if (!(avpkt->flags & AV_PKT_FLAG_KEY))
for (j = 0; j < avctx->width << 1; j++)
dst[j] += prev[j] & -!dst[j];
- prev += prev_pic->linesize[0];
- dst += pic->linesize[0];
- }
+ prev += prev_pic->linesize[0];
+ dst += pic->linesize[0];
}
/* Release the previous buffer if need be */
--
1.7.9.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
