Merge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:49:00 +0000 (22:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:49:00 +0000 (22:49 +0200)
commit514917bf1cf48965b276aac0ddb2207b50263977
tree1e968f56514e1631f30a3559ef5134833fa8c41c
parent9ae26ef9c3442b9c2cfa2c0f1bc346febd9a9499
parent3938b6762132d3d7ef1b5782e7dc8bf73ac8145d
Merge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1

* commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mp3enc.c