diff options
author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /audio/decode/ad.h | |
parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/decode/ad.h')
-rw-r--r-- | audio/decode/ad.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 0bbc11ed9b..ff51ecbe35 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -48,10 +48,4 @@ extern const ad_functions_t * const mpcodecs_ad_drivers[]; // fallback if ADCTRL_SKIP not implemented: ds_fill_buffer(sh_audio->ds); #define ADCTRL_SKIP_FRAME 2 // skip block/frame, called while seeking -// fallback if ADCTRL_QUERY_FORMAT not implemented: sh_audio->sample_format -#define ADCTRL_QUERY_FORMAT 3 // test for availabilty of a format - -// fallback: use hw mixer in libao -#define ADCTRL_SET_VOLUME 4 // not used at the moment - #endif /* MPLAYER_AD_H */ |