yadif: support more than yuv420p.

[ffmpeg] / libavcodec / cyuv.c

diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index 14eee3e0bdf28e22146bb0824d65d80a4669d7b4..ecdec17439843155436ba7d66d30c62644130d47 100644 (file)
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -6,25 +6,25 @@
  *
  * Copyright (C) 2003 the ffmpeg project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file libavcodec/cyuv.c
+ * @file
  * Creative YUV (CYUV) Video Decoder.
  */
 
@@ -167,15 +167,25 @@ static int cyuv_decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
+static av_cold int cyuv_decode_end(AVCodecContext *avctx)
+{
+    CyuvDecodeContext *s = avctx->priv_data;
+
+    if (s->frame.data[0])
+        avctx->release_buffer(avctx, &s->frame);
+
+    return 0;
+}
+
 #if CONFIG_AURA_DECODER
-AVCodec aura_decoder = {
+AVCodec ff_aura_decoder = {
     "aura",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_AURA,
     sizeof(CyuvDecodeContext),
     cyuv_decode_init,
     NULL,
-    NULL,
+    cyuv_decode_end,
     cyuv_decode_frame,
     CODEC_CAP_DR1,
     NULL,
@@ -184,14 +194,14 @@ AVCodec aura_decoder = {
 #endif
 
 #if CONFIG_CYUV_DECODER
-AVCodec cyuv_decoder = {
+AVCodec ff_cyuv_decoder = {
     "cyuv",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_CYUV,
     sizeof(CyuvDecodeContext),
     cyuv_decode_init,
     NULL,
-    NULL,
+    cyuv_decode_end,
     cyuv_decode_frame,
     CODEC_CAP_DR1,
     NULL,