diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-08-02 03:43:36 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-08-02 03:43:36 +0000 |
| commit | 6b477e1b712a785dbbdd9974668a82a1490a16e4 (patch) | |
| tree | 82fb8e70048e8161b332ffaf2b9324923f82d564 | |
| parent | 9184d53a031a9c061caef90a1542e98a43ca6353 (diff) | |
| download | ffmpeg-6b477e1b712a785dbbdd9974668a82a1490a16e4.tar.gz | |
keep original codec/fourcc endianness, fix XDCAMHD.mov
Originally committed as revision 14506 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 551eca974d..4d156c7cdf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -879,7 +879,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) if (st->codec->bits_per_sample == 8) st->codec->codec_id = CODEC_ID_PCM_S8; else if (st->codec->bits_per_sample == 24) - st->codec->codec_id = CODEC_ID_PCM_S24BE; + st->codec->codec_id = + st->codec->codec_id == CODEC_ID_PCM_S16BE ? + CODEC_ID_PCM_S24BE : CODEC_ID_PCM_S24LE; break; /* set values for old format before stsd version 1 appeared */ case CODEC_ID_MACE3: |