summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-03-06 23:20:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-03-06 23:20:53 +0000
commit40c5fa2689105b0c4913e50b3bfd131e42afd592 (patch)
treed267244674d4b75bb7ce3288f24160aa60b540a5 /libavcodec/avcodec.h
parent6867a90b41c81f15649606e9b45fa138ef7ab72e (diff)
AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>)
with minor changes from me Originally committed as revision 4019 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 81068046c1..f9eef2ff09 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -17,7 +17,7 @@ extern "C" {
#define FFMPEG_VERSION_INT 0x000409
#define FFMPEG_VERSION "0.4.9-pre1"
-#define LIBAVCODEC_BUILD 4746
+#define LIBAVCODEC_BUILD 4747
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION
@@ -1818,15 +1818,6 @@ typedef struct AVOption {
} AVOption;
/**
- * Parse option(s) and sets fields in passed structure
- * @param strct structure where the parsed results will be written
- * @param list list with AVOptions
- * @param opts string with options for parsing
- */
-int avoption_parse(void* strct, const AVOption* list, const char* opts);
-
-
-/**
* AVCodec.
*/
typedef struct AVCodec {
@@ -1840,7 +1831,7 @@ typedef struct AVCodec {
int (*decode)(AVCodecContext *, void *outdata, int *outdata_size,
uint8_t *buf, int buf_size);
int capabilities;
- const AVOption *options;
+ void *dummy; // FIXME remove next time we break binary compatibility
struct AVCodec *next;
void (*flush)(AVCodecContext *);
const AVRational *supported_framerates; ///array of supported framerates, or NULL if any, array is terminated by {0,0}