diff options
| author | James Almer <jamrial@gmail.com> | 2016-03-25 00:05:05 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-03-25 00:05:05 -0300 |
| commit | 99388eb091d0435a7f4fdb12aaa37f17f2ff951a (patch) | |
| tree | a3b62f17d157943fcabed32cd91896aa81354af1 | |
| parent | 21cd0228beca6ad1d340536c7c90ceea6bc54bb4 (diff) | |
| download | ffmpeg-99388eb091d0435a7f4fdb12aaa37f17f2ff951a.tar.gz | |
avcodec/libopenjpegenc: fix mixed declarations and code
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/libopenjpegenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index b67c320b2f..56c8219633 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); |