diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-04-26 00:01:41 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-04-26 00:01:41 +0100 |
| commit | 66c3a44b4feb04165e6849f54483b22611431482 (patch) | |
| tree | 80f6326f4e93025f3fd5f9d75769cfbc44a2f7b3 /include/xine | |
| parent | b283b2b640024cff685dd019e9df992d31aebeab (diff) | |
| parent | 8c3fd22df0ca058d6acd94772d79cd1550627b4d (diff) | |
| download | xine-lib-66c3a44b4feb04165e6849f54483b22611431482.tar.gz xine-lib-66c3a44b4feb04165e6849f54483b22611431482.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c
Diffstat (limited to 'include/xine')
| -rw-r--r-- | include/xine/buffer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 6959b1de0..487e17a93 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -394,6 +394,13 @@ struct buf_element_s { /* represent the state of gapless_switch at the time buf was enqueued */ #define BUF_FLAG_GAPLESS_SW 0x1000 +/* Amount of audio padding added by encoder (mp3, aac). These empty + * audio frames are causing a gap when switching between mp3 files. + * decoder_info[1] carries amount of audio frames padded at the + * beginning of the buffer + * decoder_info[2] carries amount of audio frames padded at the end of + * the buffer */ +#define BUF_FLAG_AUDIO_PADDING 0x2000 /** * \defgroup buffer_special Special buffer types: |