[FFmpeg-cvslog] Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 18:04:34 2016 +0000| [f99195d56f4aab266926724ca1cfae822df4df16] | committer: Derek Buitenhuis

Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'

* commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364':
  voc: Split ff_voc_get_packet into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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