summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-06-23 21:04:35 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-06-23 21:04:35 +0000
commit8292ca3541e7375c0d05c40000e8359884027b74 (patch)
tree35f327de2108eea249b9c0720bb69ca30fba2901 /src/libffmpeg/libavcodec/avcodec.h
parent6bd244f210873b33611713256c58d9d139e0e945 (diff)
downloadxine-lib-8292ca3541e7375c0d05c40000e8359884027b74.tar.gz
xine-lib-8292ca3541e7375c0d05c40000e8359884027b74.tar.bz2
quick ffmpeg update (enables wmv1 decoding)
thanks to the ffmpeg team for their amazing work! CVS patchset: 2141 CVS date: 2002/06/23 21:04:35
Diffstat (limited to 'src/libffmpeg/libavcodec/avcodec.h')
-rw-r--r--src/libffmpeg/libavcodec/avcodec.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/avcodec.h b/src/libffmpeg/libavcodec/avcodec.h
index 68b67154d..d9775db52 100644
--- a/src/libffmpeg/libavcodec/avcodec.h
+++ b/src/libffmpeg/libavcodec/avcodec.h
@@ -329,6 +329,8 @@ extern AVCodec mpeg4_encoder;
extern AVCodec msmpeg4v1_encoder;
extern AVCodec msmpeg4v2_encoder;
extern AVCodec msmpeg4v3_encoder;
+extern AVCodec wmv1_encoder;
+extern AVCodec wmv2_encoder;
extern AVCodec h263_decoder;
extern AVCodec mpeg4_decoder;
@@ -336,6 +338,7 @@ extern AVCodec msmpeg4v1_decoder;
extern AVCodec msmpeg4v2_decoder;
extern AVCodec msmpeg4v3_decoder;
extern AVCodec wmv1_decoder;
+extern AVCodec wmv2_decoder;
extern AVCodec mpeg_decoder;
extern AVCodec h263i_decoder;
extern AVCodec rv10_decoder;
@@ -520,4 +523,11 @@ typedef enum {
*/
int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout);
+/* memory */
+void *av_malloc(int size);
+void *av_mallocz(int size);
+void av_free(void *ptr);
+void __av_freep(void **ptr);
+#define av_freep(p) __av_freep((void **)(p))
+
#endif /* AVCODEC_H */