Commit a7fcb3ea authored by Chris Flerackers's avatar Chris Flerackers Committed by Michael Niedermayer

rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)

Originally committed as revision 3141 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e96682e6
...@@ -17,7 +17,7 @@ extern "C" { ...@@ -17,7 +17,7 @@ extern "C" {
#define FFMPEG_VERSION_INT 0x000408 #define FFMPEG_VERSION_INT 0x000408
#define FFMPEG_VERSION "0.4.8" #define FFMPEG_VERSION "0.4.8"
#define LIBAVCODEC_BUILD 4713 #define LIBAVCODEC_BUILD 4714
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION #define LIBAVCODEC_VERSION FFMPEG_VERSION
...@@ -792,7 +792,7 @@ typedef struct AVCodecContext { ...@@ -792,7 +792,7 @@ typedef struct AVCodecContext {
/* every time the encoder as a packet to send */ /* every time the encoder as a packet to send */
/* Depends on the encoder if the data starts */ /* Depends on the encoder if the data starts */
/* with a Start Code (it should) H.263 does */ /* 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 */ /* statistics, used for 2-pass encoding */
int mv_bits; int mv_bits;
......
...@@ -4102,7 +4102,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ ...@@ -4102,7 +4102,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
} }
if (s->avctx->rtp_callback) 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){ switch(s->codec_id){
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
...@@ -4543,7 +4543,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ ...@@ -4543,7 +4543,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; pdif = pbBufPtr(&s->pb) - s->ptr_lastgob;
/* Call the RTP callback to send the last GOB */ /* Call the RTP callback to send the last GOB */
emms_c(); emms_c();
s->avctx->rtp_callback(s->ptr_lastgob, pdif, 0); s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, 0);
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment