Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2017-03-25 04:23:41 +00:00
commit 4ebd78ca14
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -304,7 +304,7 @@ Int StreamHandlerLibav::decodeVideoPkt( Bool& gotFrame )
{
gotFrame = false;
Int decResult;
Int decResult = 0;
if( m_cPacket.stream_index == m_iStreamIdx )
{
#ifdef FF_SEND_RECEIVE_API