Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:04:34 +0000 (18:04 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:04:34 +0000 (18:04 +0000)
commitf99195d56f4aab266926724ca1cfae822df4df16
tree34e045aacb2c306e90e761c9ec2810c793fe8117
parent745d0c0300852e902199f39d282dc60e64b8c208
parent0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364
Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/Makefile
libavformat/voc_packet.c
libavformat/vocdec.c