diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-09 01:22:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-09 01:22:31 +0100 |
| commit | a8cedbebf163ad376abc4703b3156c44d0858404 (patch) | |
| tree | 7198ad7a96b58d3ea53b2208601b707da2db3c00 /libavformat/rtpenc.c | |
| parent | a4524930d9299dbb8fafe165105d83bf7b6d3b89 (diff) | |
| parent | ea1d64ab1066145ba919b79a2080f3091d562217 (diff) | |
| download | ffmpeg-a8cedbebf163ad376abc4703b3156c44d0858404.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ttadec: unbreak playback of matroska files
vorbisdec: avoid invalid memory access
Fix uninitialized reads on malformed ogg files.
huffyuv: add padding to classic (v1) huffman tables.
png: convert to bytestream2 API.
dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
avs: fix infinite loop on end-of-stream.
tiffdec: Prevent illegal memory access caused by recycled pointers.
rtpenc: Fix the AVRational used for av_rescale_q_rnd
wma: fix off-by-one in array bounds check.
Conflicts:
libavcodec/huffyuv.c
libavcodec/pngdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 1e1dac5ef0..6c1029b19c 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -138,7 +138,7 @@ static int rtp_write_header(AVFormatContext *s1) s->max_frames_per_packet = av_rescale_q_rnd(s1->max_delay, AV_TIME_BASE_Q, - (AVRational){ frame_size / st->codec->sample_rate }, + (AVRational){ frame_size, st->codec->sample_rate }, AV_ROUND_DOWN); } } |