OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab539d9
)
Do not set codec_tag property for matroska muxers.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 28 Aug 2011 21:13:17 +0000
(23:13 +0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 28 Aug 2011 21:13:17 +0000
(23:13 +0200)
Fixes ticket #8.
libavformat/matroskaenc.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskaenc.c
b/libavformat/matroskaenc.c
index
0910da5
..
d7610cf
100644
(file)
--- a/
libavformat/matroskaenc.c
+++ b/
libavformat/matroskaenc.c
@@
-1235,7
+1235,6
@@
AVOutputFormat ff_matroska_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
- .codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.subtitle_codec = CODEC_ID_SSA,
.query_codec = mkv_query_codec,
};
@@
-1274,6
+1273,5
@@
AVOutputFormat ff_matroska_audio_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER,
- .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
};
#endif