Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2015-06-16 16:28:34 +0300
committerPaul B Mahol <onemda@gmail.com>2015-06-16 22:17:28 +0300
commite0dac40306928bf544a34f4054504654e8f374d0 (patch)
treedd7539808efb7b8febc0e6c20ae13285de73e7c5 /libavcodec/codec_desc.c
parent34121ca187340129851e2c41427b0e6db8820c8d (diff)
avcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder name
Also fixes clash with smv audio codec. Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/codec_desc.c')
-rw-r--r--libavcodec/codec_desc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index c1694f3383..f32843afa7 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1178,7 +1178,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
{
.id = AV_CODEC_ID_SMVJPEG,
.type = AVMEDIA_TYPE_VIDEO,
- .name = "smv",
+ .name = "smvjpeg",
.long_name = NULL_IF_CONFIG_SMALL("Sigmatel Motion Video"),
},