* Copyright (C) 2009 Michael Niedermayer <michaelni@gmx.at>
* Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
avctx->coded_frame = avcodec_alloc_frame();
avctx->coded_frame->key_frame = 1;
- avctx->coded_frame->pict_type = FF_I_TYPE;
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
return 0;
}
-static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data)
+static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
+ int buf_size, void *data)
{
const AVFrame *pic = data;
int aligned_width = ((avctx->width + 47) / 48) * 48;
int stride = aligned_width * 8 / 3;
int h, w;
- const uint16_t *y = pic->data[0];
- const uint16_t *u = pic->data[1];
- const uint16_t *v = pic->data[2];
+ const uint16_t *y = (const uint16_t*)pic->data[0];
+ const uint16_t *u = (const uint16_t*)pic->data[1];
+ const uint16_t *v = (const uint16_t*)pic->data[2];
uint8_t *p = buf;
uint8_t *pdst = buf;
((*b++ & 0xFFC0) << 4); \
val|= (*c++ & 0xFFC0) << 14; \
bytestream_put_le32(&p, val); \
- } while (0);
+ } while (0)
for (h = 0; h < avctx->height; h++) {
uint32_t val;
pdst += stride;
memset(p, 0, pdst - p);
p = pdst;
- y += pic->linesize[0]/2 - avctx->width;
- u += pic->linesize[1]/2 - avctx->width/2;
- v += pic->linesize[2]/2 - avctx->width/2;
+ y += pic->linesize[0] / 2 - avctx->width;
+ u += pic->linesize[1] / 2 - avctx->width / 2;
+ v += pic->linesize[2] / 2 - avctx->width / 2;
}
return p - buf;
return 0;
}
-AVCodec v210_encoder = {
+AVCodec ff_v210_encoder = {
"v210",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_V210,
0,
encode_init,
encode_frame,
encode_close,
- .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV422P16, -1},
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P16, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
};