diff options
| author | Chris Flerackers <cflerackers@androme.be> | 2004-05-18 17:23:49 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-18 17:23:49 +0000 |
| commit | a7fcb3ea5c232f29fc95fae390a6eb127fddb024 (patch) | |
| tree | afb1e27a3e80beae2cfb528b9d2d43cf49c39f18 | |
| parent | e96682e6f4c1fbddf468f9f051729332163c1db9 (diff) | |
rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)
Originally committed as revision 3141 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e56a5b280d..90728ebbb6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -17,7 +17,7 @@ extern "C" { #define FFMPEG_VERSION_INT 0x000408 #define FFMPEG_VERSION "0.4.8" -#define LIBAVCODEC_BUILD 4713 +#define LIBAVCODEC_BUILD 4714 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION FFMPEG_VERSION @@ -792,7 +792,7 @@ typedef struct AVCodecContext { /* every time the encoder as a packet to send */ /* Depends on the encoder if the data starts */ /* with a Start Code (it should) H.263 does */ - void (*rtp_callback)(void *data, int size, int packet_number); + void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int packet_number); /* statistics, used for 2-pass encoding */ int mv_bits; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 246d480e56..e9dfaf3a6a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -4102,7 +4102,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ } if (s->avctx->rtp_callback) - s->avctx->rtp_callback(s->ptr_lastgob, current_packet_size, 0); + s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, 0); switch(s->codec_id){ case CODEC_ID_MPEG4: @@ -4543,7 +4543,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; /* Call the RTP callback to send the last GOB */ emms_c(); - s->avctx->rtp_callback(s->ptr_lastgob, pdif, 0); + s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, 0); } return 0; |