]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'dbb43b8b83b097585ec255ec638b61e359ebea77'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:39:01 +0000 (15:39 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:39:10 +0000 (15:39 +0100)
* commit 'dbb43b8b83b097585ec255ec638b61e359ebea77':
  avpacket: properly reset data/size in av_packet_move_ref()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/avpacket.c

Simple merge