Merge commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 19:49:25 +0000 (20:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 19:49:43 +0000 (20:49 +0100)
commite08ff208c7934754e408f3985a68833f8c4b69c3
tree252628882218bc8e8f059dd5ae262c53ac378c15
parent363effbb99f7fa8e4f3e1616d9e6cf29f01b1966
parentb3d11437ca55d81eeb10c923343ad69b73895fa8
Merge commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8'

* commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8':
  oggenc: remove unneeded null check

See: a147c1b2b125c26cd2c5105a7f274a597de37731
Merged-by: Michael Niedermayer <michaelni@gmx.at>