Browse code

avcodec: add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL flag

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>

James Almer authored on 2017/09/02 02:56:05
Showing 4 changed files
... ...
@@ -15,6 +15,10 @@ libavutil:     2015-08-28
15 15
 
16 16
 API changes, most recent first:
17 17
 
18
+2017-09-04 - xxxxxxx - lavc 57.105.100 - avcodec.h
19
+  Add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL, replacing the deprecated
20
+  HWACCEL_CODEC_CAP_EXPERIMENTAL flag.
21
+
18 22
 2017-09-01 - xxxxxxx - lavf 57.81.100 - avio.h
19 23
   Add avio_read_partial().
20 24
 
... ...
@@ -3879,7 +3879,7 @@ typedef struct AVHWAccel {
3879 3879
 
3880 3880
     /**
3881 3881
      * Hardware accelerated codec capabilities.
3882
-     * see HWACCEL_CODEC_CAP_*
3882
+     * see AV_HWACCEL_CODEC_CAP_*
3883 3883
      */
3884 3884
     int capabilities;
3885 3885
 
... ...
@@ -3988,6 +3988,12 @@ typedef struct AVHWAccel {
3988 3988
 } AVHWAccel;
3989 3989
 
3990 3990
 /**
3991
+ * HWAccel is experimental and is thus avoided in favor of non experimental
3992
+ * codecs
3993
+ */
3994
+#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200
3995
+
3996
+/**
3991 3997
  * Hardware acceleration should be used for decoding even if the codec level
3992 3998
  * used is unknown or higher than the maximum supported level reported by the
3993 3999
  * hardware driver.
... ...
@@ -1150,7 +1150,7 @@ static int setup_hwaccel(AVCodecContext *avctx,
1150 1150
         return AVERROR(ENOENT);
1151 1151
     }
1152 1152
 
1153
-    if (hwa->capabilities & HWACCEL_CODEC_CAP_EXPERIMENTAL &&
1153
+    if (hwa->capabilities & AV_HWACCEL_CODEC_CAP_EXPERIMENTAL &&
1154 1154
         avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
1155 1155
         av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n",
1156 1156
                hwa->name);
... ...
@@ -28,8 +28,8 @@
28 28
 #include "libavutil/version.h"
29 29
 
30 30
 #define LIBAVCODEC_VERSION_MAJOR  57
31
-#define LIBAVCODEC_VERSION_MINOR 104
32
-#define LIBAVCODEC_VERSION_MICRO 101
31
+#define LIBAVCODEC_VERSION_MINOR 105
32
+#define LIBAVCODEC_VERSION_MICRO 100
33 33
 
34 34
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35 35
                                                LIBAVCODEC_VERSION_MINOR, \