Mercurial > libavcodec.hg
comparison avcodec.h @ 2880:4d91f38477ee libavcodec
dont include opt.h in avcodec.h
author | michael |
---|---|
date | Mon, 12 Sep 2005 18:24:48 +0000 |
parents | d0b61801ea47 |
children | e578b3572987 |
comparison
equal
deleted
inserted
replaced
2879:d0b61801ea47 | 2880:4d91f38477ee |
---|---|
10 #ifdef __cplusplus | 10 #ifdef __cplusplus |
11 extern "C" { | 11 extern "C" { |
12 #endif | 12 #endif |
13 | 13 |
14 #include "avutil.h" | 14 #include "avutil.h" |
15 #include "opt.h" | |
16 #include <sys/types.h> /* size_t */ | 15 #include <sys/types.h> /* size_t */ |
17 | 16 |
18 //FIXME the following 2 really dont belong in here | 17 //FIXME the following 2 really dont belong in here |
19 #define FFMPEG_VERSION_INT 0x000409 | 18 #define FFMPEG_VERSION_INT 0x000409 |
20 #define FFMPEG_VERSION "CVS" | 19 #define FFMPEG_VERSION "CVS" |
680 const char* class_name; | 679 const char* class_name; |
681 const char* (*item_name)(void*); /* actually passing a pointer to an AVCodecContext | 680 const char* (*item_name)(void*); /* actually passing a pointer to an AVCodecContext |
682 or AVFormatContext, which begin with an AVClass. | 681 or AVFormatContext, which begin with an AVClass. |
683 Needed because av_log is in libavcodec and has no visibility | 682 Needed because av_log is in libavcodec and has no visibility |
684 of AVIn/OutputFormat */ | 683 of AVIn/OutputFormat */ |
685 AVOption *option; | 684 struct AVOption *option; |
686 }; | 685 }; |
687 | 686 |
688 /** | 687 /** |
689 * main external api structure. | 688 * main external api structure. |
690 */ | 689 */ |