diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:50:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:50:50 +0200 |
| commit | 0a6d39791165e46c53c34793261378ef38442272 (patch) | |
| tree | a42426ab1847e82e7ed379c9f5aa99e96412add2 /libavcodec/atrac.c | |
| parent | 081f4f5f56e0f6220039e39b9be2c2a2021dd40c (diff) | |
| parent | bbd632082b18e6c5ce9c2d6be8bc260c05ae9417 (diff) | |
| download | ffmpeg-0a6d39791165e46c53c34793261378ef38442272.tar.gz | |
Merge commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417' into release/1.1
* commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417':
mpegenc: limit the maximum muxrate
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac.c')
0 files changed, 0 insertions, 0 deletions