aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2008-08-19 11:00:40 +0000
committerPeter Ross <pross@xvid.org>2008-08-19 11:00:40 +0000
commita1ef2c4bb3a7aac249e6d07efcae01d7abf5485a (patch)
treef28671d947dc76ab2d06186048f6a352a5e80080
parent57406d8eb85aba0a5527a84168dd361a00f819ba (diff)
downloadffmpeg-a1ef2c4bb3a7aac249e6d07efcae01d7abf5485a.tar.gz
Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/isom.c2
-rw-r--r--libavformat/mov.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index c4a04b3941..35940201ab 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -163,6 +163,8 @@ const AVCodecTag codec_movaudio_tags[] = {
{ CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */
{ CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */
{ CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') },
+ { CODEC_ID_PCM_F32BE, MKTAG('f', 'l', '3', '2') },
+ { CODEC_ID_PCM_F64BE, MKTAG('f', 'l', '6', '4') },
{ CODEC_ID_PCM_S8, MKTAG('s', 'o', 'w', 't') },
{ CODEC_ID_PCM_U8, MKTAG('r', 'a', 'w', ' ') }, /* 8 bits unsigned */
{ CODEC_ID_PCM_U8, MKTAG('N', 'O', 'N', 'E') }, /* uncompressed */
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 62efb0e8f4..8c077f549d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -565,6 +565,12 @@ static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
case CODEC_ID_PCM_S32BE:
st->codec->codec_id = CODEC_ID_PCM_S32LE;
break;
+ case CODEC_ID_PCM_F32BE:
+ st->codec->codec_id = CODEC_ID_PCM_F32LE;
+ break;
+ case CODEC_ID_PCM_F64BE:
+ st->codec->codec_id = CODEC_ID_PCM_F64LE;
+ break;
default:
break;
}