virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

v4l2: use codec descriptors for mapping a codec name to id

Browse Source 
This mapping has nothing to do with decoder implementations, so using
decoder names is wrong.
This commit is contained in:
Anton Khirnov 2016-12-14 13:22:19 +01:00
parent ee480790c7
commit 0fea8555ae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavdevice/v4l2.c
View File

@ -771,16 +771,16 @@ static int v4l2_read_header(AVFormatContext *s1)
}
if (s->pixel_format) {
AVCodec *codec = avcodec_find_decoder_by_name(s->pixel_format);
const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(s->pixel_format);
if (codec) {
s1->video_codec_id = codec->id;
if (desc) {
s1->video_codec_id = desc->id;
st->need_parsing = AVSTREAM_PARSE_HEADERS;
}
pix_fmt = av_get_pix_fmt(s->pixel_format);
if (pix_fmt == AV_PIX_FMT_NONE && !codec) {
if (pix_fmt == AV_PIX_FMT_NONE && !desc) {
av_log(s1, AV_LOG_ERROR, "No such input format: %s.\n",
s->pixel_format);