diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:48:20 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:48:28 +0100 |
commit | 6f0a82966d82a88bedab91c617df502c3855e9aa (patch) | |
tree | 4b139f8e46053860027620beaa087ae0a6c09f56 /.gitignore | |
parent | f6f1e1a7a14d0cde4055fa98be2783c5a1131d5b (diff) | |
parent | 12b3459979f5ea6481660cd2c99a0381e2b5ba37 (diff) | |
download | ffmpeg-6f0a82966d82a88bedab91c617df502c3855e9aa.tar.gz |
Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'
* commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37':
rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions