[SCM] libav/experimental: change codec id if sample size field is set to 24 in stsd, fix Sony-mx5p.mov

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0299a87c417a20506641433e255421a18e1b895b
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Sep 28 17:52:48 2006 +0000

    change codec id if sample size field is set to 24 in stsd, fix Sony-mx5p.mov
    
    Originally committed as revision 6371 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8441a32..6c4f7d4 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -977,6 +977,8 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
             case CODEC_ID_PCM_S16BE:
                 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;
                 break;
             default:
                 break;

-- 
Libav/FFmpeg packaging