Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / frwu.c

diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c
index b47cb717f2c3b6bb693e509c52490e2264de9f2f..4c7971345035ccbc1dc914a214162622d112a49c 100644 (file)
--- a/libavcodec/frwu.c
+++ b/libavcodec/frwu.c
@@ -22,7 +22,6 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
-#include "libavutil/intreadwrite.h"
 
 static av_cold int decode_init(AVCodecContext *avctx)
 {
@@ -54,7 +53,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         av_log(avctx, AV_LOG_ERROR, "Packet is too small.\n");
         return AVERROR_INVALIDDATA;
     }
-    if (bytestream_get_le32(&buf) != AV_RL32("FRW1")) {
+    if (bytestream_get_le32(&buf) != MKTAG('F', 'R', 'W', '1')) {
         av_log(avctx, AV_LOG_ERROR, "incorrect marker\n");
         return AVERROR_INVALIDDATA;
     }
@@ -121,5 +120,5 @@ AVCodec ff_frwu_decoder = {
     .close          = decode_close,
     .decode         = decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
+    .long_name      = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
 };