From 99388eb091d0435a7f4fdb12aaa37f17f2ff951a Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 25 Mar 2016 00:05:05 -0300 Subject: avcodec/libopenjpegenc: fix mixed declarations and code Signed-off-by: James Almer --- libavcodec/libopenjpegenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/libopenjpegenc.c') diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index b67c320..56c8219 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -595,6 +595,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, #else // OPENJPEG_MAJOR_VERSION == 2 opj_codec_t *compress = NULL; opj_stream_t *stream = NULL; + PacketWriter writer = { 0 }; #endif // OPENJPEG_MAJOR_VERSION == 1 int cpyresult = 0; int ret; @@ -746,7 +747,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, memcpy(pkt->data, stream->buffer, len); #else // OPENJPEG_MAJOR_VERSION == 2 - PacketWriter writer = {0, pkt}; + writer.packet = pkt; opj_stream_set_write_function(stream, stream_write); opj_stream_set_skip_function(stream, stream_skip); opj_stream_set_seek_function(stream, stream_seek); -- cgit v1.1