]> git.sesse.net Git - casparcg/commitdiff
Merge pull request #134 from cambell-prince/master_dshow
authorHellGore <helge.norberg@gmail.com>
Thu, 30 May 2013 13:38:11 +0000 (06:38 -0700)
committerHellGore <helge.norberg@gmail.com>
Thu, 30 May 2013 13:38:11 +0000 (06:38 -0700)
ffmpeg dshow: Fix packet life preserver in video_decoder

1  2 
modules/ffmpeg/ffmpeg.cpp
modules/ffmpeg/producer/video/video_decoder.cpp

Simple merge