[FFmpeg-cvslog] Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Jan  1 17:14:46 2016 +0100| [5c06fc4bd88eddb8f8d4fef689fb48d006486dd2] | committer: Hendrik Leppkes

Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c06fc4bd88eddb8f8d4fef689fb48d006486dd2
---