diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-07-17 12:29:07 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-07-17 12:29:07 +0000 |
| commit | 7a06ff148d0321e863a682334c59f59b3e8e7b6d (patch) | |
| tree | 4b6b4fd27b6fb39589517a0bfde54f701d319130 /libavcodec/avcodec.h | |
| parent | bc3513865a10f0f070bdc4eafd4e0df2b2ca3f6d (diff) | |
| download | ffmpeg-7a06ff148d0321e863a682334c59f59b3e8e7b6d.tar.gz | |
AVCodec.flush()
ff_draw_horiz_band() in coded order / cleanup
Originally committed as revision 2064 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0ccc77cd27..82fd85a88e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -15,8 +15,8 @@ extern "C" { #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4669 -#define LIBAVCODEC_BUILD_STR "4669" +#define LIBAVCODEC_BUILD 4670 +#define LIBAVCODEC_BUILD_STR "4670" #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR @@ -473,7 +473,7 @@ typedef struct AVCodecContext { * - decoding: set by user. */ void (*draw_horiz_band)(struct AVCodecContext *s, - uint8_t **src_ptr, int linesize, + AVFrame *src, int offset[4], int y, int width, int height); /* audio only */ @@ -1209,6 +1209,7 @@ typedef struct AVCodec { int capabilities; const AVOption *options; struct AVCodec *next; + void (*flush)(AVCodecContext *); } AVCodec; /** @@ -1400,7 +1401,12 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic); void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic); void avcodec_default_free_buffers(AVCodecContext *s); +/** + * opens / inits the AVCodecContext. + * not thread save! + */ int avcodec_open(AVCodecContext *avctx, AVCodec *codec); + int avcodec_decode_audio(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, uint8_t *buf, int buf_size); |