aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-03-08 20:57:42 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-03-08 20:57:42 +0000
commit9169174fd6101490f391bc5879ded1efd7880db6 (patch)
tree978b24ec5e1c6c2d71a843cb60c01d4101253b7b
parentdd14a04e4a5e05e1fe88ba3acf7029df64344e3c (diff)
downloadffmpeg-9169174fd6101490f391bc5879ded1efd7880db6.tar.gz
10l typo, fix ts total bit rate computation
Originally committed as revision 22343 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegtsenc.c4
-rw-r--r--tests/ref/lavf/ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 0d315a0fb0..6ad58dbab0 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -476,8 +476,8 @@ static int mpegts_write_header(AVFormatContext *s)
total_bit_rate +=
total_bit_rate * 4 / (TS_PACKET_SIZE-4) + /* TS header size */
- 1000 * 8 * sdt_size / PAT_RETRANS_TIME + /* SDT size */
- 1000 * 8 * pat_pmt_size / SDT_RETRANS_TIME + /* PAT+PMT size */
+ 1000 * 8 * sdt_size / SDT_RETRANS_TIME + /* SDT size */
+ 1000 * 8 * pat_pmt_size / PAT_RETRANS_TIME + /* PAT+PMT size */
1000 * 8 * 8 / PCR_RETRANS_TIME; /* PCR size */
if (s->mux_rate)
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index 28acde18fd..c42e247b82 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-3ecdc566c525d58bc287ce1baffd9407 *./tests/data/lavf/lavf.ts
- 430144 ./tests/data/lavf/lavf.ts
+1e39846ad39b799686df372fcf08d8b0 *./tests/data/lavf/lavf.ts
+428452 ./tests/data/lavf/lavf.ts
./tests/data/lavf/lavf.ts CRC=0x133216c1