diff options
| author | Andriy Gelman <andriy.gelman@gmail.com> | 2019-11-04 22:32:59 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-06 20:38:03 +0100 |
| commit | 7b2ce27e56cfb4c55490035283a687251061bb50 (patch) | |
| tree | be2719cad183999d84ea0934e6cf1521e97f3eaf | |
| parent | a0c74060754821d2b04b84860d2d56ed15c08738 (diff) | |
| download | ffmpeg-streaming-7b2ce27e56cfb4c55490035283a687251061bb50.zip ffmpeg-streaming-7b2ce27e56cfb4c55490035283a687251061bb50.tar.gz | |
avdevice/v4l2: Remove av_assert0 when format not supported
Before this commit an av_assert0 would fail if a v4l2 device did not
support a target format.
For example,
./ffmpeg -f v4l2 -codec:v h264 -i /dev/video0 -f mpegts -
would signal an abort if /dev/video0 did not support h264.
The new behaviour is to return an AVERROR(EINVAL) error code. An
av_assert0 has been added to verify this return.
Fixes #6629
Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavdevice/v4l2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 446a243..365bacd 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -811,7 +811,8 @@ static int device_try_init(AVFormatContext *ctx, } *codec_id = ff_fmt_v4l2codec(*desired_format); - av_assert0(*codec_id != AV_CODEC_ID_NONE); + if (*codec_id == AV_CODEC_ID_NONE) + av_assert0(ret == AVERROR(EINVAL)); return ret; } |
