cosmetics: Write NULL pointer equality checks more compactly

[ffmpeg] / libavcodec / dvdsubenc.c

diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 71c5e792d0d177eae774a87bdd51bccfd4abb526..f62e943e7f06756453c9cc8212f11fbb904b219b 100644 (file)
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -1,5 +1,5 @@
 /*
- * DVD subtitle encoding for ffmpeg
+ * DVD subtitle encoding
  * Copyright (c) 2005 Wolfram Gloger
  *
  * This file is part of Libav.
@@ -97,7 +97,7 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
     unsigned long hist[256];
     int           cmap[256];
 
-    if (rects == 0 || h->rects == NULL)
+    if (rects == 0 || !h->rects)
         return -1;
     if (rects > 20)
         rects = 20;
@@ -205,10 +205,10 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
 }
 
 static int dvdsub_encode(AVCodecContext *avctx,
-                         unsigned char *buf, int buf_size, void *data)
+                         unsigned char *buf, int buf_size,
+                         const AVSubtitle *sub)
 {
     //DVDSubtitleContext *s = avctx->priv_data;
-    AVSubtitle *sub = data;
     int ret;
 
     ret = encode_dvd_subtitles(buf, buf_size, sub);
@@ -216,11 +216,9 @@ static int dvdsub_encode(AVCodecContext *avctx,
 }
 
 AVCodec ff_dvdsub_encoder = {
-    "dvdsub",
-    AVMEDIA_TYPE_SUBTITLE,
-    CODEC_ID_DVD_SUBTITLE,
-    0,
-    NULL,
-    dvdsub_encode,
-    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
+    .name           = "dvdsub",
+    .long_name      = NULL_IF_CONFIG_SMALL("DVD subtitles"),
+    .type           = AVMEDIA_TYPE_SUBTITLE,
+    .id             = AV_CODEC_ID_DVD_SUBTITLE,
+    .encode_sub     = dvdsub_encode,
 };