libav build error (const AVPacket* parameter)

This commit is contained in:
wang-bin
2014-11-21 15:37:41 +08:00
parent 56b5d159d3
commit 2ba77eb93e
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -76,7 +76,8 @@ bool AudioDecoder::decode(const Packet &packet)
if (!isAvailable())
return false;
DPTR_D(AudioDecoder);
int ret = avcodec_decode_audio4(d.codec_ctx, d.frame, &d.got_frame_ptr, packet.asAVPacket());
// const AVPacket*: ffmpeg >= 1.0. no libav
int ret = avcodec_decode_audio4(d.codec_ctx, d.frame, &d.got_frame_ptr, (AVPacket*)packet.asAVPacket());
d.undecoded_size = qMin(packet.data.size() - ret, packet.data.size());
if (ret == AVERROR(EAGAIN)) {
return false;
+2 -1
View File
@@ -127,7 +127,8 @@ bool VideoDecoder::decode(const Packet &packet)
return false;
DPTR_D(VideoDecoder);
// some decoders might in addition need other fields like flags&AV_PKT_FLAG_KEY
int ret = avcodec_decode_video2(d.codec_ctx, d.frame, &d.got_frame_ptr, packet.asAVPacket());
// const AVPacket*: ffmpeg >= 1.0. no libav
int ret = avcodec_decode_video2(d.codec_ctx, d.frame, &d.got_frame_ptr, (AVPacket*)packet.asAVPacket());
//qDebug("pic_type=%c", av_get_picture_type_char(d.frame->pict_type));
d.undecoded_size = qMin(packet.data.size() - ret, packet.data.size());
if (ret < 0) {