git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
34121ca
)
avcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder name
author
Paul B Mahol
<onemda@gmail.com>
Tue, 16 Jun 2015 13:28:34 +0000
(13:28 +0000)
committer
Paul B Mahol
<onemda@gmail.com>
Tue, 16 Jun 2015 19:17:28 +0000
(19:17 +0000)
Also fixes clash with smv audio codec.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/codec_desc.c
patch
|
blob
|
history
diff --git
a/libavcodec/codec_desc.c
b/libavcodec/codec_desc.c
index
c1694f3
..
f32843a
100644
(file)
--- 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 = "smv
jpeg
",
.long_name = NULL_IF_CONFIG_SMALL("Sigmatel Motion Video"),
},