Rename ff_parse_eval() to ff_eval_expr().

[ffmpeg] / libavcodec / c93.c

diff --git a/libavcodec/c93.c b/libavcodec/c93.c
index 7502de6cff37b7e65cfdf7002b427784c71f6a02..d713ff8e26366381bee0e32e6bcf32094778908f 100644 (file)
--- a/libavcodec/c93.c
+++ b/libavcodec/c93.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avcodec.h"
@@ -46,13 +45,13 @@ typedef enum {
 #define C93_HAS_PALETTE 0x01
 #define C93_FIRST_FRAME 0x02
 
-static int decode_init(AVCodecContext *avctx)
+static av_cold int decode_init(AVCodecContext *avctx)
 {
     avctx->pix_fmt = PIX_FMT_PAL8;
     return 0;
 }
 
-static int decode_end(AVCodecContext *avctx)
+static av_cold int decode_end(AVCodecContext *avctx)
 {
     C93DecoderContext * const c93 = avctx->priv_data;
 
@@ -114,15 +113,16 @@ static inline void draw_n_color(uint8_t *out, int stride, int width,
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data,
-                            int *data_size, uint8_t * buf, int buf_size)
+                            int *data_size, AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     C93DecoderContext * const c93 = avctx->priv_data;
     AVFrame * const newpic = &c93->pictures[c93->currentpic];
     AVFrame * const oldpic = &c93->pictures[c93->currentpic^1];
     AVFrame *picture = data;
     uint8_t *out;
-    int stride, i, x, y;
-    C93BlockType bt = 0;
+    int stride, i, x, y, bt = 0;
 
     c93->currentpic ^= 1;
 
@@ -146,7 +146,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
 
     if (*buf++ & C93_HAS_PALETTE) {
         uint32_t *palette = (uint32_t *) newpic->data[1];
-        uint8_t *palbuf = buf + buf_size - 768 - 1;
+        const uint8_t *palbuf = buf + buf_size - 768 - 1;
         for (i = 0; i < 256; i++) {
             palette[i] = bytestream_get_be24(&palbuf);
         }
@@ -161,11 +161,13 @@ static int decode_frame(AVCodecContext *avctx, void *data,
             uint8_t *copy_from = oldpic->data[0];
             unsigned int offset, j;
             uint8_t cols[4], grps[4];
+            C93BlockType block_type;
 
             if (!bt)
                 bt = *buf++;
 
-            switch (bt & 0x0F) {
+            block_type= bt & 0x0F;
+            switch (block_type) {
             case C93_8X8_FROM_PREV:
                 offset = bytestream_get_le16(&buf);
                 if (copy_block(avctx, out, copy_from, offset, 8, stride))
@@ -199,11 +201,11 @@ static int decode_frame(AVCodecContext *avctx, void *data,
             case C93_4X4_4COLOR_GRP:
                 for (j = 0; j < 8; j += 4) {
                     for (i = 0; i < 8; i += 4) {
-                        if ((bt & 0x0F) == C93_4X4_2COLOR) {
+                        if (block_type == C93_4X4_2COLOR) {
                             bytestream_get_buffer(&buf, cols, 2);
                             draw_n_color(out + i + j*stride, stride, 4, 4,
                                     1, cols, NULL, bytestream_get_le16(&buf));
-                        } else if ((bt & 0x0F) == C93_4X4_4COLOR) {
+                        } else if (block_type == C93_4X4_4COLOR) {
                             bytestream_get_buffer(&buf, cols, 4);
                             draw_n_color(out + i + j*stride, stride, 4, 4,
                                     2, cols, NULL, bytestream_get_le32(&buf));
@@ -226,7 +228,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
 
             default:
                 av_log(avctx, AV_LOG_ERROR, "unexpected type %x at %dx%d\n",
-                       bt & 0x0F, x, y);
+                       block_type, x, y);
                 return -1;
             }
             bt >>= 4;
@@ -242,7 +244,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
 
 AVCodec c93_decoder = {
     "c93",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_C93,
     sizeof(C93DecoderContext),
     decode_init,
@@ -250,4 +252,5 @@ AVCodec c93_decoder = {
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
 };