aacenc: Fix bug in writing libavcodec_ident.

[ffmpeg] / libavcodec / j2kenc.c

diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index 50b2b2137aa50c4fe6aa1ce007bef459095af648..7f8fdf14a0496e0683f8b963f7b43a8398e051bd 100644 (file)
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -869,7 +869,8 @@ static int encode_tile(J2kEncoderContext *s, J2kTile *tile, int tileno)
                                 int *ptr = t1.data[y-yy0];
                                 for (x = xx0; x < xx1; x++){
                                     *ptr = (comp->data[(comp->coord[0][1] - comp->coord[0][0]) * y + x]);
-                                    *ptr++ = (int64_t)*ptr * (int64_t)(8192 * 8192 / band->stepsize) >> 13 - NMSEDEC_FRACBITS;
+                                    *ptr = (int64_t)*ptr * (int64_t)(8192 * 8192 / band->stepsize) >> 13 - NMSEDEC_FRACBITS;
+                                    *ptr++;
                                 }
                             }
                         }
@@ -1035,17 +1036,17 @@ static int j2kenc_destroy(AVCodecContext *avctx)
 }
 
 AVCodec ff_jpeg2000_encoder = {
-    "j2k",
-    AVMEDIA_TYPE_VIDEO,
-    CODEC_ID_JPEG2000,
-    sizeof(J2kEncoderContext),
-    j2kenc_init,
-    encode_frame,
-    j2kenc_destroy,
+    .name           = "j2k",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = CODEC_ID_JPEG2000,
+    .priv_data_size = sizeof(J2kEncoderContext),
+    .init           = j2kenc_init,
+    .encode         = encode_frame,
+    .close          = j2kenc_destroy,
     .capabilities= CODEC_CAP_EXPERIMENTAL,
     .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
     .pix_fmts =
-        (enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8,
+        (const enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_YUV444P, PIX_FMT_GRAY8,
 /*                              PIX_FMT_YUV420P,
                               PIX_FMT_YUV422P, PIX_FMT_YUV444P,
                               PIX_FMT_YUV410P, PIX_FMT_YUV411P,*/