Merge commit 'd584533cf38141172e20bae5436629ee17c8ce50'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:06:11 +0000 (14:06 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:06:11 +0000 (14:06 +0100)
commit54de179caa39e1c2f3cbea61dd05f818bb78a3b6
tree0f962d3cb8f4f50bf0d1bd72ba0b46144912e052
parentc048303823164ad0039907760636d59cdb46ad0e
parentd584533cf38141172e20bae5436629ee17c8ce50
Merge commit 'd584533cf38141172e20bae5436629ee17c8ce50'

* commit 'd584533cf38141172e20bae5436629ee17c8ce50':
  avformat: Rework add_to_pktbuf

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