mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)
Originally committed as revision 3141 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e96682e6f4
commit
a7fcb3ea5c
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user