Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:31:45 +0000 (01:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 00:31:49 +0000 (01:31 +0100)
commit5cb6b53050e39ed3cf7dabcf3cd8198a934f9bd2
treefd71fe492208b02db3eb5d3cf615e6a5ddbd6ed2
parent78c59f3f0c9f20c3d143bd75fdf125bdf032b16d
parent4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f
Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'

* commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f':
  rtpenc: Don't set max_frames_per_packet based on the packet frame size or frame rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpenc.c
libavformat/rtpenc_aac.c
libavformat/rtpenc_amr.c
libavformat/rtpenc_xiph.c