diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
| commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
| tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavutil/fifo.h | |
| parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
| parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) | |
| download | ffmpeg-35ce42e07029b3af62f652a53719fee99bb7a5aa.tar.gz | |
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/fifo.h')
| -rw-r--r-- | libavutil/fifo.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavutil/fifo.h b/libavutil/fifo.h index ff66c95daa..849b9a6b81 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -141,15 +141,4 @@ static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs) return ptr; } -#if FF_API_AV_FIFO_PEEK -/** - * @deprecated Use av_fifo_peek2() instead. - */ -attribute_deprecated -static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs) -{ - return *av_fifo_peek2(f, offs); -} -#endif - #endif /* AVUTIL_FIFO_H */ |