diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 20:13:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 20:13:41 +0200 |
| commit | 742f9aa8792827fe8718247045ab64401c42e46e (patch) | |
| tree | d9d8c596c70e93e6a518799c41adc686d1316a93 /libavresample/utils.c | |
| parent | 09abca68025f6c20618c81f710dc7af57548b103 (diff) | |
| parent | 0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb (diff) | |
| download | ffmpeg-742f9aa8792827fe8718247045ab64401c42e46e.tar.gz | |
Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2
* commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions