diff mbox

[FFmpeg-devel] avcodec/hapqa_extract: remove the AVOption flags

Message ID 20180314010946.4332-1-jamrial@gmail.com
State Accepted
Commit f706cdda5694d2fce24bfb2ee81a4382327fa760
Headers show

Commit Message

James Almer March 14, 2018, 1:09 a.m. UTC
These two are not used for bitstream filters.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/hapqa_extract_bsf.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Martin Vignali March 14, 2018, 6:32 a.m. UTC | #1
2018-03-14 2:09 GMT+01:00 James Almer <jamrial@gmail.com>:

> These two are not used for bitstream filters.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/hapqa_extract_bsf.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/hapqa_extract_
> bsf.c
> index ee5dc191f7..652f79a7fe 100644
> --- a/libavcodec/hapqa_extract_bsf.c
> +++ b/libavcodec/hapqa_extract_bsf.c
> @@ -110,11 +110,10 @@ static const enum AVCodecID codec_ids[] = {
>  };
>
>  #define OFFSET(x) offsetof(HapqaExtractContext, x)
> -#define FLAGS     AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
>  static const AVOption options[] = {
> -    { "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, {
> .i64 = 0 }, 0, 1, FLAGS,  "texture" },
> -        { "color", "keep HapQ texture", 0, AV_OPT_TYPE_CONST, { .i64 = 0
> }, 0, 0, FLAGS, "texture" },
> -        { "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, {
> .i64 = 1 }, 0, 0, FLAGS, "texture" },
> +    { "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, {
> .i64 = 0 }, 0, 1, 0, "texture" },
> +        { "color", "keep HapQ texture",         0, AV_OPT_TYPE_CONST, {
> .i64 = 0 }, .unit = "texture" },
> +        { "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, {
> .i64 = 1 }, .unit = "texture" },
>      { NULL },
>  };
>
>
>
ok

Martin
James Almer March 14, 2018, 3:30 p.m. UTC | #2
On 3/14/2018 3:32 AM, Martin Vignali wrote:
> 2018-03-14 2:09 GMT+01:00 James Almer <jamrial@gmail.com>:
> 
>> These two are not used for bitstream filters.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavcodec/hapqa_extract_bsf.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/hapqa_extract_
>> bsf.c
>> index ee5dc191f7..652f79a7fe 100644
>> --- a/libavcodec/hapqa_extract_bsf.c
>> +++ b/libavcodec/hapqa_extract_bsf.c
>> @@ -110,11 +110,10 @@ static const enum AVCodecID codec_ids[] = {
>>  };
>>
>>  #define OFFSET(x) offsetof(HapqaExtractContext, x)
>> -#define FLAGS     AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
>>  static const AVOption options[] = {
>> -    { "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, {
>> .i64 = 0 }, 0, 1, FLAGS,  "texture" },
>> -        { "color", "keep HapQ texture", 0, AV_OPT_TYPE_CONST, { .i64 = 0
>> }, 0, 0, FLAGS, "texture" },
>> -        { "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, {
>> .i64 = 1 }, 0, 0, FLAGS, "texture" },
>> +    { "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, {
>> .i64 = 0 }, 0, 1, 0, "texture" },
>> +        { "color", "keep HapQ texture",         0, AV_OPT_TYPE_CONST, {
>> .i64 = 0 }, .unit = "texture" },
>> +        { "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, {
>> .i64 = 1 }, .unit = "texture" },
>>      { NULL },
>>  };
>>
>>
>>
> ok
> 
> Martin

Pushed, thanks.
diff mbox

Patch

diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/hapqa_extract_bsf.c
index ee5dc191f7..652f79a7fe 100644
--- a/libavcodec/hapqa_extract_bsf.c
+++ b/libavcodec/hapqa_extract_bsf.c
@@ -110,11 +110,10 @@  static const enum AVCodecID codec_ids[] = {
 };
 
 #define OFFSET(x) offsetof(HapqaExtractContext, x)
-#define FLAGS     AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-    { "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS,  "texture" },
-        { "color", "keep HapQ texture", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, FLAGS, "texture" },
-        { "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "texture" },
+    { "texture", "texture to keep", OFFSET(texture), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, 0, "texture" },
+        { "color", "keep HapQ texture",         0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .unit = "texture" },
+        { "alpha", "keep HapAlphaOnly texture", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .unit = "texture" },
     { NULL },
 };