[SCM] libav/experimental: keep original codec/fourcc endianness, fix XDCAMHD.mov

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6b477e1b712a785dbbdd9974668a82a1490a16e4
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sat Aug 2 03:43:36 2008 +0000

    keep original codec/fourcc endianness, fix XDCAMHD.mov
    
    Originally committed as revision 14506 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 551eca9..4d156c7 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:

-- 
Libav/FFmpeg packaging