Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:48:20 +0000 (00:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:48:28 +0000 (00:48 +0100)
commit6f0a82966d82a88bedab91c617df502c3855e9aa
tree4b139f8e46053860027620beaa087ae0a6c09f56
parentf6f1e1a7a14d0cde4055fa98be2783c5a1131d5b
parent12b3459979f5ea6481660cd2c99a0381e2b5ba37
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>
libavformat/rtpenc_amr.c