Remove another compile-time dependancy of libavfilter on libavcodec. Originally committed as revision 25923 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -13,6 +13,10 @@ libavutil: 2009-03-08 · 12 unmodified lines | |||
| 13 | 13 | ||
| 14 | API changes, most recent first: | 14 | API changes, most recent first: |
| 15 | 15 | ||
| 16 | 2010-12-09 - r25923 - lavcore 0.16.0 - avcore.h | ||
| 17 | Move AV_NOPTS_VALUE, AV_TIME_BASE, AV_TIME_BASE_Q symbols from | ||
| 18 | avcodec.h to avcore.h. | ||
| 19 | |||
| 16 | 2010-12-04 - r25886 - lavc 52.98.0 - CODEC_CAP_NEG_LINESIZES | 20 | 2010-12-04 - r25886 - lavc 52.98.0 - CODEC_CAP_NEG_LINESIZES |
| 17 | Add CODEC_CAP_NEG_LINESIZES codec capability flag in avcodec.h. | 21 | Add CODEC_CAP_NEG_LINESIZES codec capability flag in avcodec.h. |
| 18 | 22 | ||
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | 33 | ||
| 34 | #define LIBAVCODEC_VERSION_MAJOR 52 | 34 | #define LIBAVCODEC_VERSION_MAJOR 52 |
| 35 | #define LIBAVCODEC_VERSION_MINOR 99 | 35 | #define LIBAVCODEC_VERSION_MINOR 99 |
| 36 | #define LIBAVCODEC_VERSION_MICRO 0 | 36 | #define LIBAVCODEC_VERSION_MICRO 1 |
| 37 | 37 | ||
| 38 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 38 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| 39 | LIBAVCODEC_VERSION_MINOR, \ | 39 | LIBAVCODEC_VERSION_MINOR, \ |
| @@ -89,10 +89,6 @@ · 49 unmodified lines | |||
| 89 | # define FF_INTERNALC_MEM_TYPE size_t | 89 | # define FF_INTERNALC_MEM_TYPE size_t |
| 90 | #endif | 90 | #endif |
| 91 | 91 | ||
| 92 | #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) | ||
| 93 | #define AV_TIME_BASE 1000000 | ||
| 94 | #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} | ||
| 95 | |||
| 96 | /** | 92 | /** |
| 97 | * Identify the syntax and semantics of the bitstream. | 93 | * Identify the syntax and semantics of the bitstream. |
| 98 | * The principle is roughly: | 94 | * The principle is roughly: |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | |||
| 27 | #include "libavutil/avutil.h" | 27 | #include "libavutil/avutil.h" |
| 28 | 28 | ||
| 29 | #define LIBAVCORE_VERSION_MAJOR 0 | 29 | #define LIBAVCORE_VERSION_MAJOR 0 |
| 30 | #define LIBAVCORE_VERSION_MINOR 15 | 30 | #define LIBAVCORE_VERSION_MINOR 16 |
| 31 | #define LIBAVCORE_VERSION_MICRO 0 | 31 | #define LIBAVCORE_VERSION_MICRO 0 |
| 32 | 32 | ||
| 33 | #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ | 33 | #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ |
| @@ -55,6 +55,10 @@ const char *avcore_configuration(void); · 21 unmodified lines | |||
| 55 | */ | 55 | */ |
| 56 | const char *avcore_license(void); | 56 | const char *avcore_license(void); |
| 57 | 57 | ||
| 58 | #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) | ||
| 59 | #define AV_TIME_BASE 1000000 | ||
| 60 | #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} | ||
| 61 | |||
| 58 | /** | 62 | /** |
| 59 | * Those FF_API_* defines are not part of public API. | 63 | * Those FF_API_* defines are not part of public API. |
| 60 | * They may change, break or disappear at any time. | 64 | * They may change, break or disappear at any time. |
| @@ -23,10 +23,12 @@ · 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 "libavcore/avcore.h" | ||
| 27 | #include "libavcore/samplefmt.h" | ||
| 26 | 28 | ||
| 27 | #define LIBAVFILTER_VERSION_MAJOR 1 | 29 | #define LIBAVFILTER_VERSION_MAJOR 1 |
| 28 | #define LIBAVFILTER_VERSION_MINOR 68 | 30 | #define LIBAVFILTER_VERSION_MINOR 68 |
| 29 | #define LIBAVFILTER_VERSION_MICRO 0 | 31 | #define LIBAVFILTER_VERSION_MICRO 1 |
| 30 | 32 | ||
| 31 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | 33 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| 32 | LIBAVFILTER_VERSION_MINOR, \ | 34 | LIBAVFILTER_VERSION_MINOR, \ |
| @@ -37,7 +39,6 @@ · 4 unmodified lines | |||
| 37 | #define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT | 39 | #define LIBAVFILTER_BUILD LIBAVFILTER_VERSION_INT |
| 38 | 40 | ||
| 39 | #include <stddef.h> | 41 | #include <stddef.h> |
| 40 | #include "libavcodec/avcodec.h" | ||
| 41 | 42 | ||
| 42 | /** | 43 | /** |
| 43 | * Return the LIBAVFILTER_VERSION_INT constant. | 44 | * Return the LIBAVFILTER_VERSION_INT constant. |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "libavcodec/avcodec.h" /* AVFrame */ | ||
| 22 | #include "avfilter.h" | 23 | #include "avfilter.h" |
| 23 | 24 | ||
| 24 | int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, | 25 | int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, |