videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '619d5e7db88941cadb8136f805564e885c6c6434' 

* commit '619d5e7db88941cadb8136f805564e885c6c6434':
  v4l2: Use the codec descriptor facility

Conflicts:
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-02 20:16:22 +01:00
parent ada512f91d 619d5e7db8
commit cde6e328de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavdevice/v4l2.c
View File

@ -285,9 +285,9 @@ static void list_formats(AVFormatContext *ctx, int type)
vfd.description);
} else if (vfd.flags & V4L2_FMT_FLAG_COMPRESSED &&
type & V4L_COMPFORMATS) {
AVCodec *codec = avcodec_find_decoder(codec_id);
av_log(ctx, AV_LOG_INFO, "Compressed: %9s : %20s :",
codec ? codec->name : "Unsupported",
const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id);
av_log(ctx, AV_LOG_INFO, "Compressedll : %9s : %20s :",
desc ? desc->name : "Unsupported",
vfd.description);
} else {
continue;