Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:14:46 +0000 (17:14 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:14:46 +0000 (17:14 +0100)
commit5c06fc4bd88eddb8f8d4fef689fb48d006486dd2
treef85fed0f469c51f685f85c4f5af12220ad74a2bf
parent95daa9e09aeccf6ccef4b5c08097f6b5b581de15
parent2d0432d918a71468419b7ac1e543ab3b399d3d37
Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37'

* commit '2d0432d918a71468419b7ac1e543ab3b399d3d37':
  vocdec: put the code not shared with other demuxers under appropriate ifdef

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