[FFmpeg-cvslog] Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  1 00:48:20 2015 +0100| [6f0a82966d82a88bedab91c617df502c3855e9aa] | committer: Michael Niedermayer

Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'

* commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37':
  rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f0a82966d82a88bedab91c617df502c3855e9aa
---