diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:26:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:26:11 +0200 |
| commit | d8441791410a090043a192e6897b11dda7f89d4d (patch) | |
| tree | 0da9031744bf14cf46bd9b351c688e805709d15c | |
| parent | 707cfea37497ca7b1debc20fcf9b720ac5612d01 (diff) | |
| parent | b5f92f9603c2b46c37b20134e9e2338805844f0f (diff) | |
| download | ffmpeg-d8441791410a090043a192e6897b11dda7f89d4d.tar.gz | |
Merge commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f' into release/1.1
* commit 'b5f92f9603c2b46c37b20134e9e2338805844f0f':
isom: lpcm in mov default to big endian
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/isom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 3b609db00a..93db737419 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -279,6 +279,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { AV_CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, { AV_CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, { AV_CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, + { AV_CODEC_ID_PCM_S16BE, MKTAG('l', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, |