diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:28:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:28:57 +0200 |
| commit | 516ba41f05c8a0e4054d2a858e2951a6091c4811 (patch) | |
| tree | 0aefa5796f62a7bd8854d8e3e3ff3d2aee9b2e21 /libavformat/network.h | |
| parent | 1a642b72172da93b376f27240f19c981eb310507 (diff) | |
| parent | 7bc37641e3e6c24d472ae06fcbecaba4c863829b (diff) | |
| download | ffmpeg-516ba41f05c8a0e4054d2a858e2951a6091c4811.tar.gz | |
Merge commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b' into release/2.2
* commit '7bc37641e3e6c24d472ae06fcbecaba4c863829b':
avconv: fix the muxrate values for -target
Conflicts:
ffmpeg_opt.c
No change, as ffmpegs muxrate is in bits/sec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
0 files changed, 0 insertions, 0 deletions