Simplify rms(): merge a few operations in the same statement

[ffmpeg] / libavcodec / dvdsubdec.c

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index ed50596563ac59f6d3714d0ad59c3064c4d988ac..f95c329e7637d721db3c7203fc0c9e9a65c94f14 100644 (file)
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -440,6 +440,8 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s)
 
 #ifdef DEBUG
 #undef fprintf
+#undef perror
+#undef exit
 static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
                      uint32_t *rgba_palette)
 {
@@ -469,7 +471,7 @@ static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
 
 static int dvdsub_decode(AVCodecContext *avctx,
                          void *data, int *data_size,
-                         uint8_t *buf, int buf_size)
+                         const uint8_t *buf, int buf_size)
 {
     AVSubtitle *sub = (void *)data;
     int is_menu;
@@ -506,4 +508,5 @@ AVCodec dvdsub_decoder = {
     NULL,
     NULL,
     dvdsub_decode,
+    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };