Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:50:21 +0000 (15:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 13:50:21 +0000 (15:50 +0200)
commita1fb3e512778ed940ce754b8e70c4dd99109c1e2
tree3a4ae2e1a631692cb1d3f8113c6af1af35792597
parentb3dfda8a410dba1ff2a80b4e243befce1d5f79c5
parent19b9659f3174599e8685d329c4330b1ea8c4c6db
Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'

* commit '19b9659f3174599e8685d329c4330b1ea8c4c6db':
  oggparseogm: Convert to use bytestream2

Conflicts:
libavformat/oggparseogm.c

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