diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:21:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:27:06 +0200 |
| commit | bd148ce07de08dcd03178e869bacf1e1ef6358df (patch) | |
| tree | fb5513ff5954e85e1187f8d87a9155e920929a35 /libavformat/amr.c | |
| parent | daa7bccad2279d43e7173dba0174c2052a65a51f (diff) | |
| parent | cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016 (diff) | |
| download | ffmpeg-bd148ce07de08dcd03178e869bacf1e1ef6358df.tar.gz | |
Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'
* commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016':
rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions