summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo.h
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-31 13:19:50 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-31 13:19:50 +0000
commit899e19f1776c607c126b291a7e0a614782f18f42 (patch)
tree50792a530d56f35fff93eab04e03c2b8a6b8ad95 /libavcodec/mpegvideo.h
parent9938697c1c119a675759029ead74b91c529cdf2e (diff)
parent936f0d98f864f9f6bb4f9e5458b78537e146bacd (diff)
downloadffmpeg-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/mpegvideo.h')
-rw-r--r--libavcodec/mpegvideo.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 62cedf0c99..5836afd034 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -481,6 +481,7 @@ typedef struct MpegEncContext {
/* RTP specific */
int rtp_mode;
+ int rtp_payload_size;
char *tc_opt_str; ///< timecode option string
AVTimecode tc; ///< timecode context
@@ -646,6 +647,7 @@ FF_MPV_OPT_CMP_FUNC, \
{"sc_threshold", "Scene change threshold", FF_MPV_OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"noise_reduction", "Noise reduction", FF_MPV_OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"mpeg_quant", "Use MPEG quantizers instead of H.263", FF_MPV_OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \
+{"ps", "RTP payload size in bytes", FF_MPV_OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
extern const AVOption ff_mpv_generic_options[];