Merge commit '7dba055bb0d31b2c79d9c3a66abb849a71417d3c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 20:03:34 +0000 (22:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 20:03:34 +0000 (22:03 +0200)
commitb3f9052177f24c20f96aea5e565f84aa4024dd06
treeb3ca90abffb8ee841262e74b9792ba402e3c93c5
parentc14045c818674a1212bfb6e451f513ce916b613a
parent7dba055bb0d31b2c79d9c3a66abb849a71417d3c
Merge commit '7dba055bb0d31b2c79d9c3a66abb849a71417d3c'

* commit '7dba055bb0d31b2c79d9c3a66abb849a71417d3c':
  oggenc: Fix the EOS flag

Conflicts:
tests/ref/lavf/ogg

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