diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:26:51 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-29 15:26:51 +0100 |
| commit | 93fb4a46298c5dc456154b0eb594b8a704e366cd (patch) | |
| tree | 855235c037579d68bc4ed8c3764872ea1e9b53ec /libavcodec/avcodec.h | |
| parent | da7cfef7f0c98c05571c62d344aad83e0e85d0fb (diff) | |
| parent | 462a54e2291e1fa18e1f1254d09739dfbb795617 (diff) | |
| download | ffmpeg-93fb4a46298c5dc456154b0eb594b8a704e366cd.tar.gz | |
Merge commit '462a54e2291e1fa18e1f1254d09739dfbb795617'
* commit '462a54e2291e1fa18e1f1254d09739dfbb795617':
lavc: Deprecate avctx.rtp_callback field
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 448ba8ae25..5e36c94ee3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2607,13 +2607,19 @@ typedef struct AVCodecContext { */ int64_t timecode_frame_start; +#if FF_API_RTP_CALLBACK + /** + * @deprecated unused + */ /* The RTP callback: This function is called */ /* every time the encoder has a packet to send. */ /* It depends on the encoder if the data starts */ /* with a Start Code (it should). H.263 does. */ /* mb_nb contains the number of macroblocks */ /* encoded in the RTP payload. */ + attribute_deprecated void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); +#endif int rtp_payload_size; /* The size of the RTP payload: the coder will */ /* do its best to deliver a chunk with size */ |