timecode: support >24h timecode.

[ffmpeg] / libavcodec / proresenc.c

diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index 1dc865cbb0ffd8578d51da4ed872fc6cf76e1132..09678a002f584395d27acdd08a438418c2e28ccb 100644 (file)
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -234,10 +234,10 @@ static void encode_ac_coeffs(AVCodecContext *avctx, PutBitContext *pb,
     int prev_run = 4;
     int prev_level = 2;
 
-    int run = 0, level, code;
-    for (int i = 1; i < 64; i++) {
+    int run = 0, level, code, i, j;
+    for (i = 1; i < 64; i++) {
         int indp = progressive_scan[i];
-        for (int j = 0; j < blocks_per_slice; j++) {
+        for (j = 0; j < blocks_per_slice; j++) {
             int val = QSCALE(qmat, indp, in[(j << 6) + indp]);
             if (val) {
                 encode_codeword(pb, run, run_to_cb[FFMIN(prev_run, 15)]);
@@ -441,13 +441,13 @@ static int prores_encode_picture(AVCodecContext *avctx, AVFrame *pic,
 {
     int mb_width = (avctx->width + 15) >> 4;
     int mb_height = (avctx->height + 15) >> 4;
-    int hdr_size, sl_size;
+    int hdr_size, sl_size, i;
     int mb_y, sl_data_size, qp;
     int unsafe_bot, unsafe_right;
     uint8_t *sl_data, *sl_data_sizes;
     int slice_per_line = 0, rem = mb_width;
 
-    for (int i = av_log2(DEFAULT_SLICE_MB_WIDTH); i >= 0; --i) {
+    for (i = av_log2(DEFAULT_SLICE_MB_WIDTH); i >= 0; --i) {
         slice_per_line += rem >> i;
         rem &= (1 << i) - 1;
     }
@@ -499,8 +499,8 @@ static int prores_encode_frame(AVCodecContext *avctx, unsigned char *buf,
     bytestream_put_be16(&buf, header_size);
     bytestream_put_be16(&buf, 0);
     bytestream_put_buffer(&buf, "fmpg", 4);
-    bytestream_put_be16(&buf, pic->width);
-    bytestream_put_be16(&buf, pic->height);
+    bytestream_put_be16(&buf, avctx->width);
+    bytestream_put_be16(&buf, avctx->height);
     *buf++ = 0x83; // {10}(422){00}{00}(frame){11}
     *buf++ = 0;
     *buf++ = 2;
@@ -594,6 +594,5 @@ AVCodec ff_prores_encoder = {
     .encode         = prores_encode_frame,
     .pix_fmts       = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE},
     .long_name      = NULL_IF_CONFIG_SMALL("Apple ProRes"),
-    .capabilities   = 0,
     .profiles       = profiles
 };