Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'

[ffmpeg] / libavcodec / tscc.c

diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index fcfa85b707a7098ba8dab98e6ae46906a349e766..954e372c15e04217060d97a40842e9855db68cbd 100644 (file)
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -79,12 +79,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
     int zret; // Zlib return code
     int ret, len = buf_size;
 
-    if(c->pic.data[0])
-            avctx->release_buffer(avctx, &c->pic);
-
     c->pic.reference = 3;
     c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
-    if((ret = avctx->get_buffer(avctx, &c->pic)) < 0){
+    if((ret = avctx->reget_buffer(avctx, &c->pic)) < 0){
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
@@ -206,7 +203,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 AVCodec ff_tscc_decoder = {
     .name           = "camtasia",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_TSCC,
+    .id             = AV_CODEC_ID_TSCC,
     .priv_data_size = sizeof(CamtasiaContext),
     .init           = decode_init,
     .close          = decode_end,