Proper check for --help and -h parameters

[ffmpeg] / libavcodec / bethsoftvideo.c

diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index 26328f9ac967155a10556fd6a2e5e3c00c626a09..48a4c02e5230aba178c9ab0f7200c7806a5c0875 100644 (file)
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -42,8 +42,7 @@ static int bethsoftvid_decode_init(AVCodecContext *avctx)
     vid->frame.reference = 1;
     vid->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
         FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
-    avctx->pix_fmt = PIX_FMT_PAL8;    // palette in vid->frame.data[1]
-    av_log(avctx, AV_LOG_DEBUG, "[bethsoftvid video decoder] init\n");
+    avctx->pix_fmt = PIX_FMT_PAL8;
     return 0;
 }
 
@@ -52,7 +51,7 @@ static void set_palette(AVFrame * frame, uint8_t * palette_buffer)
     uint32_t * palette = (uint32_t *)frame->data[1];
     int a;
     for(a = 0; a < 256; a++){
-        palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4;    // multiply all colors by 4
+        palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4;
     }
     frame->palette_has_changed = 1;
 }
@@ -63,21 +62,18 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
 {
     BethsoftvidContext * vid = avctx->priv_data;
     char block_type;
-    uint8_t * destination;
+    uint8_t * dst;
     uint8_t * frame_end;
-    int line_remaining = avctx->width;          // number of bytes remaining on a line
+    int remaining = avctx->width;          // number of bytes remaining on a line
     const int wrap_to_next_line = vid->frame.linesize[0] - avctx->width;
-    uint8_t rle_num_bytes;
+    int code;
     int yoffset;
 
-    av_log(avctx, AV_LOG_DEBUG, "[bethsoftvid video decoder] decoding frame\n");
-
-    // reget buffer will copy old data, good for simple difference frames
     if (avctx->reget_buffer(avctx, &vid->frame)) {
         av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
         return -1;
     }
-    destination = vid->frame.data[0];
+    dst = vid->frame.data[0];
     frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height;
 
     switch(block_type = *buf++){
@@ -88,33 +84,33 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
             yoffset = bytestream_get_le16(&buf);
             if(yoffset >= avctx->height)
                 return -1;
-            destination += vid->frame.linesize[0] * yoffset;
+            dst += vid->frame.linesize[0] * yoffset;
     }
 
     // main code
-    while((rle_num_bytes = *buf++)){
-        int length = rle_num_bytes & 0x7f;
+    while((code = *buf++)){
+        int length = code & 0x7f;
 
         // copy any bytes starting at the current position, and ending at the frame width
-        while(length > line_remaining){
-            if(rle_num_bytes < 0x80)
-                bytestream_get_buffer(&buf, destination, line_remaining);
+        while(length > remaining){
+            if(code < 0x80)
+                bytestream_get_buffer(&buf, dst, remaining);
             else if(block_type == VIDEO_I_FRAME)
-                memset(destination, buf[0], line_remaining);
-            length -= line_remaining;      // decrement the number of bytes to be copied
-            destination += line_remaining + wrap_to_next_line;    // skip over extra bytes at end of frame
-            line_remaining = avctx->width;
-            if(destination == frame_end)
+                memset(dst, buf[0], remaining);
+            length -= remaining;      // decrement the number of bytes to be copied
+            dst += remaining + wrap_to_next_line;    // skip over extra bytes at end of frame
+            remaining = avctx->width;
+            if(dst == frame_end)
                 goto end;
         }
 
         // copy any remaining bytes after / if line overflows
-        if(rle_num_bytes < 0x80)
-            bytestream_get_buffer(&buf, destination, length);
+        if(code < 0x80)
+            bytestream_get_buffer(&buf, dst, length);
         else if(block_type == VIDEO_I_FRAME)
-            memset(destination, *buf++, length);
-        line_remaining -= length;
-        destination += length;
+            memset(dst, *buf++, length);
+        remaining -= length;
+        dst += length;
     }
     end:
 
@@ -127,7 +123,6 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
 static int bethsoftvid_decode_end(AVCodecContext *avctx)
 {
     BethsoftvidContext * vid = avctx->priv_data;
-    av_log(avctx, AV_LOG_DEBUG, "[bethsoftvid video decoder] closing\n");
     if(vid->frame.data[0])
         avctx->release_buffer(avctx, &vid->frame);
     return 0;