Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."

[ffmpeg] / libavcodec / flashsv2enc.c

diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c
index 3fd716f692a06581e0f56e04209dabf97acf606f..7ee299cf7ca78d80c1a2ee9d1560960fd6aeaf8d 100644 (file)
--- a/libavcodec/flashsv2enc.c
+++ b/libavcodec/flashsv2enc.c
@@ -242,7 +242,6 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx)
 static int new_key_frame(FlashSV2Context * s)
 {
     int i;
-    FFSWAP(uint8_t * , s->keybuffer, s->encbuffer);
     memcpy(s->key_blocks, s->frame_blocks, s->blocks_size);
     memcpy(s->key_frame, s->current_frame, s->frame_size);
 
@@ -252,6 +251,7 @@ static int new_key_frame(FlashSV2Context * s)
         s->key_blocks[i].sl_end   = 0;
         s->key_blocks[i].data     = 0;
     }
+    FFSWAP(uint8_t * , s->keybuffer, s->encbuffer);
 
     return 0;
 }
@@ -315,14 +315,14 @@ static int write_block(Block * b, uint8_t * buf, int buf_size)
     buf[buf_pos++] = b->flags;
 
     if (b->flags & HAS_DIFF_BLOCKS) {
-        buf[buf_pos++] = (uint8_t) (b->start);
-        buf[buf_pos++] = (uint8_t) (b->len);
+        buf[buf_pos++] = (b->start);
+        buf[buf_pos++] = (b->len);
     }
 
     if (b->flags & ZLIB_PRIME_COMPRESS_CURRENT) {
         //This feature of the format is poorly understood, and as of now, unused.
-        buf[buf_pos++] = (uint8_t) (b->col);
-        buf[buf_pos++] = (uint8_t) (b->row);
+        buf[buf_pos++] = (b->col);
+        buf[buf_pos++] = (b->row);
     }
 
     memcpy(buf + buf_pos, b->data, b->data_size);
@@ -437,10 +437,10 @@ static int write_pixel_15_7(Palette * palette, uint8_t * dest, const uint8_t * s
     int c7 = pixel_color7_fast(palette, c15);
     int d7 = chroma_diff(color, palette->colors[c7]);
     if (dist + d15 >= d7) {
-        dest[0] = (uint8_t) c7;
+        dest[0] = c7;
         return 1;
     } else {
-        dest[0] = 0x80 | (uint8_t) (c15 >> 8);
+        dest[0] = 0x80 | (c15 >> 8);
         dest[1] = c15 & 0xff;
         return 2;
     }
@@ -903,4 +903,5 @@ AVCodec ff_flashsv2_encoder = {
     flashsv2_encode_end,
     .pix_fmts = (enum PixelFormat[]) {PIX_FMT_BGR24, PIX_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video Version 2"),
+    .capabilities   =  CODEC_CAP_EXPERIMENTAL,
 };