diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 17:00:27 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 17:00:27 +0400 |
commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavutil | |
parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) |
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')
-rw-r--r-- | libavutil/fifo.h | 11 | ||||
-rw-r--r-- | libavutil/version.h | 3 |
2 files changed, 0 insertions, 14 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 */ diff --git a/libavutil/version.h b/libavutil/version.h index e0115f79e3..8e94c6e986 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -108,9 +108,6 @@ #ifndef FF_API_FIND_OPT #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 53) #endif -#ifndef FF_API_AV_FIFO_PEEK -#define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) -#endif #ifndef FF_API_OLD_AVOPTIONS #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53) #endif |