summaryrefslogtreecommitdiffstats
path: root/av_log.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-04-20 02:59:45 +0300
committerUoti Urpala <uau@mplayer2.org>2011-04-20 04:36:05 +0300
commitc33fafd6f1bc2a430c114231cecc6e1c56c1f939 (patch)
treeffea28dc9b2845037a51cf3314b9b1f326fc1d2e /av_log.c
parent726c28dd9bbaf49d28d78f21fabd6d2d8336b9cd (diff)
downloadmpv-c33fafd6f1bc2a430c114231cecc6e1c56c1f939.tar.bz2
mpv-c33fafd6f1bc2a430c114231cecc6e1c56c1f939.tar.xz
Update libav API uses
Update various code to use newer alternatives instead of deprecated functions/fields that are being dropped at libav API bump. An exception is avcodec_thread_init() which is being dropped even though it's still _necessary_ with fairly recent libav versions, so there's no good alternative which would work with both those recent versions and latest libavcodec. I think there are grounds to consider the drop premature and revert it for now; if that doesn't happen I'll add a version-test #if check around it later.
Diffstat (limited to 'av_log.c')
-rw-r--r--av_log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/av_log.c b/av_log.c
index bd42ce3bf1..bcf1a14e09 100644
--- a/av_log.c
+++ b/av_log.c
@@ -57,10 +57,10 @@ static int extract_msg_type_from_ctx(void *ptr)
if (!strcmp(avc->class_name, "AVCodecContext")) {
AVCodecContext *s = ptr;
if (s->codec) {
- if (s->codec->type == CODEC_TYPE_AUDIO) {
+ if (s->codec->type == AVMEDIA_TYPE_AUDIO) {
if (s->codec->decode)
return MSGT_DECAUDIO;
- } else if (s->codec->type == CODEC_TYPE_VIDEO) {
+ } else if (s->codec->type == AVMEDIA_TYPE_VIDEO) {
if (s->codec->decode)
return MSGT_DECVIDEO;
}