summaryrefslogtreecommitdiff
path: root/recordmydesktop/src/load_cache.c
diff options
context:
space:
mode:
Diffstat (limited to 'recordmydesktop/src/load_cache.c')
-rw-r--r--recordmydesktop/src/load_cache.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/recordmydesktop/src/load_cache.c b/recordmydesktop/src/load_cache.c
index 00ddf96..f75c375 100644
--- a/recordmydesktop/src/load_cache.c
+++ b/recordmydesktop/src/load_cache.c
@@ -135,10 +135,11 @@ void *LoadCache(ProgData *pdata){
#ifdef HAVE_LIBASOUND
int framesize=((snd_pcm_format_width(SND_PCM_FORMAT_S16_LE))/8)*
pdata->args.channels;//audio frame size
- signed char *sound_data=(signed char *)malloc(pdata->periodsize*framesize);
#else
- signed char *sound_data=(signed char *)malloc(pdata->args.buffsize);
+ int framesize=pdata->args.channels<<1;//Always signed 16 bit data
#endif
+ signed char *sound_data=(signed char *)malloc(pdata->periodsize*framesize);
+
u_int32_t YBlocks[(yuv->y_width*yuv->y_height)/Y_UNIT_BYTES],
UBlocks[(yuv->uv_width*yuv->uv_height)/UV_UNIT_BYTES],
VBlocks[(yuv->uv_width*yuv->uv_height)/UV_UNIT_BYTES];
@@ -254,11 +255,7 @@ void *LoadCache(ProgData *pdata){
//audio load and encoding
else{
if(!audio_end){
-#ifdef HAVE_LIBASOUND
int nbytes=fread(sound_data,1,pdata->periodsize*framesize,afp);
-#else
- int nbytes=fread(sound_data,1,pdata->args.buffsize,afp);
-#endif
if(nbytes<=0)
audio_end=1;
else
© All Rights Reserved