Merge commit '103243ca649cc305129ed0352bf4d97e5ddf4d80'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:35:03 +0000 (23:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:36:12 +0000 (23:36 +0200)
commitfaabef3d3d850efb7af61ecaff9810feefc5523e
tree78051d6a0f808cd71fb701e04ab95b1155886207
parentcd016db4256d5dc9b4a698ac20fa49ff0ff3ce65
parent103243ca649cc305129ed0352bf4d97e5ddf4d80
Merge commit '103243ca649cc305129ed0352bf4d97e5ddf4d80'

* commit '103243ca649cc305129ed0352bf4d97e5ddf4d80':
  oggenc: Set the right AVOption size for the pref_duration option

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