diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 4 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 7dcb9cda55..7fb6942eeb 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -59,6 +59,8 @@ Interface changes now. - change the --hwdec option from a choice to a plain string (affects introspection of the option/property), also affects some properties + - rename --hwdec=rpi to --hwdec=mmal, sane for the -copy variant (no + backwards compatibility) --- mpv 0.27.0 --- - drop previously deprecated --field-dominance option - drop previously deprecated "osd" command diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index b67d8fe120..118bdde31e 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -698,8 +698,8 @@ Video :d3d11va-copy: copies video back to system RAM (Windows 8+ only) :mediacodec: requires ``--vo=mediacodec_embed`` (Android only) :mediacodec-copy: copies video back to system RAM (Android only) - :rpi: requires ``--vo=gpu`` (Raspberry Pi only - default if available) - :rpi-copy: copies video back to system RAM (Raspberry Pi only) + :mmal: requires ``--vo=gpu`` (Raspberry Pi only - default if available) + :mmal-copy: copies video back to system RAM (Raspberry Pi only) :cuda: requires ``--vo=gpu`` (Any platform CUDA is available) :cuda-copy: copies video back to system RAM (Any platform CUDA is available) :nvdec: requires ``--vo=gpu`` (Any platform CUDA is available) diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index f67fab5284..8f8e1b35bb 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -269,10 +269,6 @@ static void add_all_hwdec_methods(struct hwdec_info **infos, int *num_infos) if (codec->capabilities & (AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_HYBRID)) wrapper = codec->wrapper_name; - // Different lavc/mpv names. - if (wrapper && strcmp(wrapper, "mmal") == 0) - wrapper = "rpi"; - // A decoder can provide multiple methods. In particular, hwaccels // provide various methods (e.g. native h264 with vaapi & d3d11), but // even wrapper decoders could provide multiple methods. |