diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 20:16:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 20:16:22 +0100 |
| commit | cde6e328de214ffe8387641cdc1e433a2c2150f3 (patch) | |
| tree | af5983da834523bf9e2315287212a8a87901b202 /libavdevice/v4l2.c | |
| parent | ada512f91df6b1ed2fc15bd1b497a09de120ec49 (diff) | |
| parent | 619d5e7db88941cadb8136f805564e885c6c6434 (diff) | |
| download | ffmpeg-cde6e328de214ffe8387641cdc1e433a2c2150f3.tar.gz | |
Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
v4l2: Use the codec descriptor facility
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 8337cf5fc5..0f64d741b6 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -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; |