diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-07 07:56:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-07 07:56:55 +0200 |
| commit | 3fb945a935ada1ea6564985d16e609f626a2794d (patch) | |
| tree | 953aa95f60f5b8e2329c7e07012b382bc2af3c6e /libavformat | |
| parent | b717f35bfbb10d4da99b7ff9c633b54f09641f97 (diff) | |
| download | ffmpeg-3fb945a935ada1ea6564985d16e609f626a2794d.tar.gz | |
mpegpsenc: fix user specified mux rate
Fixes Ticket1175
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 0df0149911..796c9985cf 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -65,6 +65,7 @@ typedef struct { int pack_header_freq; /* frequency (in packets^-1) at which we send pack headers */ int system_header_freq; int system_header_size; + int user_mux_rate; /* bitrate in units of bits/s */ int mux_rate; /* bitrate in units of 50 bytes/s */ /* stream info */ int audio_bound; @@ -423,7 +424,9 @@ static int mpeg_mux_init(AVFormatContext *ctx) video_bitrate += codec_rate; } - if (!s->mux_rate) { + if (s->user_mux_rate) { + s->mux_rate = (s->user_mux_rate + (8 * 50) - 1) / (8 * 50); + } else { /* we increase slightly the bitrate to take into account the headers. XXX: compute it exactly */ bitrate += bitrate / 20; @@ -1237,7 +1240,7 @@ static int mpeg_mux_end(AVFormatContext *ctx) #define OFFSET(x) offsetof(MpegMuxContext, x) #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, {0}, 0, INT_MAX, E }, + { "muxrate", NULL, OFFSET(user_mux_rate), AV_OPT_TYPE_INT, {0}, 0, INT_MAX, E }, { "preload", "Initial demux-decode delay in microseconds.", OFFSET(preload), AV_OPT_TYPE_INT, {500000}, 0, INT_MAX, E}, { NULL }, }; |