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)
* commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37':
  rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpenc_amr.c

Simple merge