qsv: Join the derived session to the parent

[ffmpeg] / libavcodec / idcinvideo.c

diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 9d34f3e2476f17677d7afb10f6f32ad58ae27f7d..67dcf1c0823514ba64a5441dd519be6433449936 100644 (file)
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -1,6 +1,6 @@
 /*
  * id Quake II CIN Video Decoder
- * Copyright (C) 2003 the ffmpeg project
+ * Copyright (C) 2003 The FFmpeg project
  *
  * This file is part of Libav.
  *
@@ -56,8 +56,7 @@
 #define HUF_TOKENS 256
 #define PALETTE_COUNT 256
 
-typedef struct
-{
+typedef struct hnode {
   int count;
   unsigned char used;
   int children[2];
@@ -242,11 +241,11 @@ static int idcin_decode_frame(AVCodecContext *avctx,
 
 AVCodec ff_idcin_decoder = {
     .name           = "idcinvideo",
+    .long_name      = NULL_IF_CONFIG_SMALL("id Quake II CIN video"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_IDCIN,
     .priv_data_size = sizeof(IdcinContext),
     .init           = idcin_decode_init,
     .decode         = idcin_decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
-    .long_name      = NULL_IF_CONFIG_SMALL("id Quake II CIN video"),
+    .capabilities   = AV_CODEC_CAP_DR1,
 };