Merge commit '41ed749fe987e60b0485fa721ad869590651324d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:05:01 +0000 (13:05 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:05:01 +0000 (13:05 +0200)
commit09c15eac3e8c394531edf4aa8f4fd880e77d07e6
treeeb18769c3c75cc36c78730669b9c58b55bdc9c40
parenteadf6cb2c4e80304d9e18672bf5f5359a676deb2
parent41ed749fe987e60b0485fa721ad869590651324d
Merge commit '41ed749fe987e60b0485fa721ad869590651324d'

* commit '41ed749fe987e60b0485fa721ad869590651324d':
  ogg: Do not try to use the parser if it is not present

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/oggparsevorbis.c