diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-04-20 02:59:45 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-04-20 04:36:05 +0300 |
| commit | c33fafd6f1bc2a430c114231cecc6e1c56c1f939 (patch) | |
| tree | ffea28dc9b2845037a51cf3314b9b1f326fc1d2e /libmpcodecs/ad_ffmpeg.c | |
| parent | 726c28dd9bbaf49d28d78f21fabd6d2d8336b9cd (diff) | |
| download | mpv-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 'libmpcodecs/ad_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index ec6a2f77ac..8f56e71b5d 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -127,7 +127,7 @@ static int init(sh_audio_t *sh_audio) } lavc_context->request_channels = opts->audio_output_channels; lavc_context->codec_tag = sh_audio->format; //FOURCC - lavc_context->codec_type = CODEC_TYPE_AUDIO; + lavc_context->codec_type = AVMEDIA_TYPE_AUDIO; lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi /* alloc extra data */ |