Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 18:13:41 +0000 (20:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 18:13:41 +0000 (20:13 +0200)
commit742f9aa8792827fe8718247045ab64401c42e46e
treed9d8c596c70e93e6a518799c41adc686d1316a93
parent09abca68025f6c20618c81f710dc7af57548b103
parent0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb
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>
libavformat/mp3enc.c