* qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c
Showing the changes to libavfilter/avfilter.h (1 of 129 files). Show all
Unified · Split
| @@ -23,7 +23,10 @@ · 22 unmodified lines | |||
| 23 | #define AVFILTER_AVFILTER_H | 23 | #define AVFILTER_AVFILTER_H |
| 24 | 24 | ||
| 25 | #include "libavutil/avutil.h" | 25 | #include "libavutil/avutil.h" |
| 26 | #include "libavutil/log.h" | ||
| 26 | #include "libavutil/samplefmt.h" | 27 | #include "libavutil/samplefmt.h" |
| 28 | #include "libavutil/pixfmt.h" | ||
| 29 | #include "libavutil/rational.h" | ||
| 27 | 30 | ||
| 28 | #define LIBAVFILTER_VERSION_MAJOR 2 | 31 | #define LIBAVFILTER_VERSION_MAJOR 2 |
| 29 | #define LIBAVFILTER_VERSION_MINOR 24 | 32 | #define LIBAVFILTER_VERSION_MINOR 24 |