Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:34:39 +0000 (13:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 12:34:39 +0000 (13:34 +0100)
commit198e55bfa791943fdd477778a8b39180dab52912
tree50ee89ea653c0584afe63f2df72b19292f480f90
parentb882079b1265066e5cc7c4415322919bea4c4651
parent5aa710f46119bb9c1c38542f80f5338eb8b5ffb2
Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'

* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
  vorbisenc: add missing parenthesis

Conflicts:
libavcodec/vorbisenc.c

See: f72b735d41f9591452d2efe0987040462b409c2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbisenc.c