summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-07-28 13:43:24 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-07-28 13:43:24 +0000
commit70c9aca23b3d0a729c278c3cb76a290a2748d6c8 (patch)
tree5b5816ea532d5503c66af9a633b6c38620884b5e /libmpcodecs
parent97a62d4a161fdd7013f2cd59b1845c2c75ac0d37 (diff)
downloadmpv-70c9aca23b3d0a729c278c3cb76a290a2748d6c8.tar.bz2
mpv-70c9aca23b3d0a729c278c3cb76a290a2748d6c8.tar.xz
lavf demuxer with raw PCM fix (and a related hang)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16135 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_pcm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c
index bd76e704c5..fed9c141ba 100644
--- a/libmpcodecs/ad_pcm.c
+++ b/libmpcodecs/ad_pcm.c
@@ -67,6 +67,8 @@ static int init(sh_audio_t *sh_audio)
break;
default: if(sh_audio->samplesize!=2) sh_audio->sample_format=AF_FORMAT_U8;
}
+ if (!sh_audio->samplesize) // this would cause MPlayer to hang later
+ sh_audio->samplesize = 2;
return 1;
}