diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /audio/decode/ad.h | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz | |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'audio/decode/ad.h')
| -rw-r--r-- | audio/decode/ad.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h index ff51ecbe35..1c8a211f5b 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -42,10 +42,6 @@ typedef struct ad_functions // NULL terminated array of all drivers extern const ad_functions_t * const mpcodecs_ad_drivers[]; -// fallback if ADCTRL_RESYNC not implemented: sh_audio->a_in_buffer_len=0; #define ADCTRL_RESYNC_STREAM 1 // resync, called after seeking -// fallback if ADCTRL_SKIP not implemented: ds_fill_buffer(sh_audio->ds); -#define ADCTRL_SKIP_FRAME 2 // skip block/frame, called while seeking - #endif /* MPLAYER_AD_H */ |