diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-12-16 16:11:49 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-12-26 11:35:27 +0100 |
| commit | 3b8c7da7a36d30f8184976ea2158b534595e7738 (patch) | |
| tree | 5a8cada9925480d5568c1feff33513e58319a7bf /libavfilter/vf_mergeplanes.c | |
| parent | 55f046be1193142536198957d1701d18881d3b7a (diff) | |
| download | ffmpeg-3b8c7da7a36d30f8184976ea2158b534595e7738.tar.gz | |
lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.
INT_MAX is used here to denote the max allowed value for a pixel format.
The opt-test code is changed to provide a valid reference example.
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
| -rw-r--r-- | libavfilter/vf_mergeplanes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index 4a81412056..6fec816a4a 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -53,7 +53,7 @@ typedef struct MergePlanesContext { #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM static const AVOption mergeplanes_options[] = { { "mapping", "set input to output plane mapping", OFFSET(mapping), AV_OPT_TYPE_INT, {.i64=0}, 0, 0x33333333, FLAGS }, - { "format", "set output pixel format", OFFSET(out_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_YUVA444P}, 0, AV_PIX_FMT_NB-1, .flags=FLAGS }, + { "format", "set output pixel format", OFFSET(out_fmt), AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_YUVA444P}, 0, INT_MAX, .flags=FLAGS }, { NULL } }; |