summaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-10-27 00:02:23 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-10-27 00:02:23 +0000
commitd6db1c9c6a331da88c3eca9b0afa939dbbf24651 (patch)
treec4059ef616e9dca7d87c6e61038d5cefe445ddba /libavcodec/avcodec.h
parent5d9827bcf62a543d95ea27469e3e06153f352cda (diff)
downloadffmpeg-streaming-d6db1c9c6a331da88c3eca9b0afa939dbbf24651.zip
ffmpeg-streaming-d6db1c9c6a331da88c3eca9b0afa939dbbf24651.tar.gz
handle direct rendering buffer allocation failure
Originally committed as revision 1075 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b84c905..d5e63e3 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -5,8 +5,8 @@
#define LIBAVCODEC_VERSION_INT 0x000406
#define LIBAVCODEC_VERSION "0.4.6"
-#define LIBAVCODEC_BUILD 4631
-#define LIBAVCODEC_BUILD_STR "4631"
+#define LIBAVCODEC_BUILD 4632
+#define LIBAVCODEC_BUILD_STR "4632"
enum CodecID {
CODEC_ID_NONE,
@@ -503,7 +503,7 @@ typedef struct AVCodecContext {
* encoding: unused
* decoding: set by user
*/
- void (*get_buffer_callback)(struct AVCodecContext *c, int width, int height, int pict_type);
+ int (*get_buffer_callback)(struct AVCodecContext *c, int width, int height, int pict_type);
/**
* is 1 if the decoded stream contains b frames, 0 otherwise
OpenPOWER on IntegriCloud