xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 05:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avcodec: add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL flag

Browse Source 
This flag replaces the deprecated, non-prefixed HWACCEL_CODEC_CAP_EXPERIMENTAL
one.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-01 14:56:05 -03:00
parent b43cd67862
commit 6cadbb16e9
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -15,6 +15,10 @@ libavutil: 2015-08-28
API changes, most recent first: API changes, most recent first:
2017-09-04 - xxxxxxx - lavc 57.105.100 - avcodec.h
Add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL, replacing the deprecated
HWACCEL_CODEC_CAP_EXPERIMENTAL flag.
2017-09-01 - xxxxxxx - lavf 57.81.100 - avio.h 2017-09-01 - xxxxxxx - lavf 57.81.100 - avio.h
Add avio_read_partial(). Add avio_read_partial().

8
libavcodec/avcodec.h
View File

@ -3879,7 +3879,7 @@ typedef struct AVHWAccel {
/** /**
* Hardware accelerated codec capabilities. * Hardware accelerated codec capabilities.
* see HWACCEL_CODEC_CAP_* * see AV_HWACCEL_CODEC_CAP_*
*/ */
int capabilities; int capabilities;
@ -3987,6 +3987,12 @@ typedef struct AVHWAccel {
int caps_internal; int caps_internal;
} AVHWAccel; } AVHWAccel;
/**
* HWAccel is experimental and is thus avoided in favor of non experimental
* codecs
*/
#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
/** /**
* Hardware acceleration should be used for decoding even if the codec level * Hardware acceleration should be used for decoding even if the codec level
* used is unknown or higher than the maximum supported level reported by the * used is unknown or higher than the maximum supported level reported by the

2
libavcodec/decode.c
View File

@ -1150,7 +1150,7 @@ static int setup_hwaccel(AVCodecContext *avctx,
return AVERROR(ENOENT); return AVERROR(ENOENT);
} }
if (hwa->capabilities & HWACCEL_CODEC_CAP_EXPERIMENTAL && if (hwa->capabilities & AV_HWACCEL_CODEC_CAP_EXPERIMENTAL &&
avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n", av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n",
hwa->name); hwa->name);

4
libavcodec/version.h
View File

@ -28,8 +28,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 104 #define LIBAVCODEC_VERSION_MINOR 105
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \