diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:00:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:00:10 +0200 |
| commit | 127aee4ccb5e36916157e621f8bba5133f94cb75 (patch) | |
| tree | 10a72fce600d5e3f58e44cbc8eef1c6b71940618 /libavcodec/mjpeg.c | |
| parent | 9e8ab36f5419149bbaedd88fe0e25507d66a3c93 (diff) | |
| parent | 75bbaf2493a71ee66eaabe3c21fadd84d07888de (diff) | |
| download | ffmpeg-127aee4ccb5e36916157e621f8bba5133f94cb75.tar.gz | |
Merge commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de'
* commit '75bbaf2493a71ee66eaabe3c21fadd84d07888de':
mpegenc: limit the maximum muxrate
Conflicts:
libavformat/mpegenc.c
See: 28d35dbe9f570025c220c08997bc11e21b3c1a66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.c')
0 files changed, 0 insertions, 0 deletions