Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:21:28 +0000 (17:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:27:06 +0000 (17:27 +0200)
* commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016':
  rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase

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

Simple merge