diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:27:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:27:55 +0200 |
| commit | 1a642b72172da93b376f27240f19c981eb310507 (patch) | |
| tree | 0aefa5796f62a7bd8854d8e3e3ff3d2aee9b2e21 /libavformat/network.h | |
| parent | 58b5b062b84b09dfa49bf84497eb530da3918abf (diff) | |
| parent | 3ac0638d573fc483ba6be3444858b26711c5d67d (diff) | |
| download | ffmpeg-1a642b72172da93b376f27240f19c981eb310507.tar.gz | |
Merge commit '3ac0638d573fc483ba6be3444858b26711c5d67d' into release/2.2
* commit '3ac0638d573fc483ba6be3444858b26711c5d67d':
mpegenc: limit the maximum muxrate
Conflicts:
libavformat/mpegenc.c
See: 28d35dbe9f570025c220c08997bc11e21b3c1a66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
0 files changed, 0 insertions, 0 deletions