diff options
| author | wm4 <wm4@nowhere> | 2016-04-07 17:48:00 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-04-07 17:48:00 +0200 |
| commit | f009d16f362694b6f49571b76f8b0331966824b5 (patch) | |
| tree | 92851b786b11c32c0345cc1a803d58cc535a6219 /video/decode/videotoolbox.c | |
| parent | 32a92071b4cc58967d51a5e3ce1c3bed219d9111 (diff) | |
| download | mpv-f009d16f362694b6f49571b76f8b0331966824b5.tar.bz2 mpv-f009d16f362694b6f49571b76f8b0331966824b5.tar.xz | |
vd_lavc: fix codec vs. decoder confusion
Some functions which expected a codec name (i.e. the name of the video
format itself) were passed a decoder name. Most "native" libavcodec
decoders have the same name as the codec, so this was never an issue.
This should mean that e.g. using "--vd=lavc:h264_mmal --hwdec=mmal"
should now actually enable native surface mode (instead of doing copy-
back).
Diffstat (limited to 'video/decode/videotoolbox.c')
| -rw-r--r-- | video/decode/videotoolbox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/videotoolbox.c b/video/decode/videotoolbox.c index 61e3005bd5..2867204ecd 100644 --- a/video/decode/videotoolbox.c +++ b/video/decode/videotoolbox.c @@ -28,12 +28,12 @@ static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info, - const char *decoder) + const char *codec) { hwdec_request_api(info, "videotoolbox"); if (!info || !info->hwctx || info->hwctx->type != HWDEC_VIDEOTOOLBOX) return HWDEC_ERR_NO_CTX; - switch (mp_codec_to_av_codec_id(decoder)) { + switch (mp_codec_to_av_codec_id(codec)) { case AV_CODEC_ID_H264: case AV_CODEC_ID_H263: case AV_CODEC_ID_MPEG1VIDEO: |