ffmpeg | branch: master | Anton Khirnov <[email protected]> | Wed Dec 14 13:22:19 2016 +0100| [0fea8555ae25124c21f4c4f55a5fa76e9169aa03] | committer: Anton Khirnov
v4l2: use codec descriptors for mapping a codec name to id This mapping has nothing to do with decoder implementations, so using decoder names is wrong. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fea8555ae25124c21f4c4f55a5fa76e9169aa03 --- libavdevice/v4l2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 0479121d7d..a8afe8ab58 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -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); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
