OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e1d8d7b
)
Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file.
author
Jason Garrett-Glaser
<darkshikari@gmail.com>
Tue, 16 Jun 2009 23:50:02 +0000
(23:50 +0000)
committer
Jason Garrett-Glaser
<darkshikari@gmail.com>
Tue, 16 Jun 2009 23:50:02 +0000
(23:50 +0000)
Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
34f69aa
..
0e040c4
100644
(file)
--- a/
libavformat/isom.c
+++ b/
libavformat/isom.c
@@
-195,6
+195,8
@@
const AVCodecTag codec_movaudio_tags[] = {
{ CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */
{ CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */
+ { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '2') }, /* MPEG layer 2 */
+
{ CODEC_ID_MP3, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */
{ CODEC_ID_MP3, 0x6D730055 }, /* MPEG layer 3 */