diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-02-27 17:23:48 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-02-27 17:23:48 +0300 |
| commit | a88e2a3774c8bc3c15946d620540f6bcf3d98128 (patch) | |
| tree | 53c50e1bcb5fcf69086a89b9b1ee3d9c2da41453 | |
| parent | 77437a8bcfa085097a63f902028d779a71880751 (diff) | |
Replace deprecated CODEC_TYPE_* with AVMEDIA_TYPE_*
| -rw-r--r-- | decoder/LAVAudio/LAVAudio.cpp | 2 | ||||
| -rw-r--r-- | demuxer/Demuxers/LAVFDemuxer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/decoder/LAVAudio/LAVAudio.cpp b/decoder/LAVAudio/LAVAudio.cpp index 37fb09dd..6d248947 100644 --- a/decoder/LAVAudio/LAVAudio.cpp +++ b/decoder/LAVAudio/LAVAudio.cpp @@ -466,7 +466,7 @@ HRESULT CLAVAudio::ffmpeg_init(CodecID codec, const void *format, GUID format_ty if (codec != CODEC_ID_AAC && codec != CODEC_ID_AAC_LATM) m_pParser = av_parser_init(codec); - m_pAVCtx->codec_type = CODEC_TYPE_AUDIO; + m_pAVCtx->codec_type = AVMEDIA_TYPE_AUDIO; m_pAVCtx->codec_id = (CodecID)codec; m_pAVCtx->flags |= CODEC_FLAG_TRUNCATED; m_pAVCtx->drc_scale = m_settings.DRCEnabled ? (float)m_settings.DRCLevel / 100.0f : 0.0f; diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp index 764a3f98..7a38d95a 100644 --- a/demuxer/Demuxers/LAVFDemuxer.cpp +++ b/demuxer/Demuxers/LAVFDemuxer.cpp @@ -197,7 +197,7 @@ STDMETHODIMP CLAVFDemuxer::GetNextPacket(Packet **ppPacket) pkt.duration = (int)pkt.convergence_duration; } - if(m_bAVI && stream->codec && stream->codec->codec_type == CODEC_TYPE_VIDEO) + if(m_bAVI && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_VIDEO) { // AVI's always have borked pts, specially if m_pFormatContext->flags includes // AVFMT_FLAG_GENPTS so always use dts @@ -232,7 +232,7 @@ STDMETHODIMP CLAVFDemuxer::GetNextPacket(Packet **ppPacket) pPacket->rtStop += (duration > 0) ? duration : 1; } - if (stream->codec->codec_type == CODEC_TYPE_SUBTITLE) { + if (stream->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { pPacket->bDiscontinuity = TRUE; } else { pPacket->bSyncPoint = (rt != Packet::INVALID_TIME && duration > 0) ? 1 : 0; |