diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:19:50 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:19:50 +0000 |
| commit | 899e19f1776c607c126b291a7e0a614782f18f42 (patch) | |
| tree | 50792a530d56f35fff93eab04e03c2b8a6b8ad95 /libavcodec/avcodec.h | |
| parent | 9938697c1c119a675759029ead74b91c529cdf2e (diff) | |
| parent | 936f0d98f864f9f6bb4f9e5458b78537e146bacd (diff) | |
| download | ffmpeg-899e19f1776c607c126b291a7e0a614782f18f42.tar.gz | |
Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'
* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
lavc: Move rtp_payload_size to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0a478e6b1c..07b7e54216 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2653,12 +2653,16 @@ typedef struct AVCodecContext { void (*rtp_callback)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); #endif +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int rtp_payload_size; /* The size of the RTP payload: the coder will */ /* do its best to deliver a chunk with size */ /* below rtp_payload_size, the chunk will start */ /* with a start code on some codecs like H.263. */ /* This doesn't take account of any particular */ /* headers inside the transmitted RTP payload. */ +#endif #if FF_API_STAT_BITS /* statistics, used for 2-pass encoding */ |