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

[ffmpeg] / libavcodec / nuv.c

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index b87e4bd8c1bd6052cce75d1d318ee56a6fdde39a..189a4e9e29ad27d29364b104c81c573d02f4c506 100644 (file)
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -21,11 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/bswap.h"
+#include "libavutil/lzo.h"
 #include "avcodec.h"
-
-#include "bswap.h"
 #include "dsputil.h"
-#include "lzo.h"
 #include "rtjpeg.h"
 
 typedef struct {
@@ -271,6 +270,6 @@ AVCodec nuv_decoder = {
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "NuppelVideo",
+    .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo"),
 };