]> git.sesse.net Git - casparcg/commitdiff
2.0.0.2: ffmpeg_producer: Fixed buffer size notification.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 14 May 2011 18:21:42 +0000 (18:21 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sat, 14 May 2011 18:21:42 +0000 (18:21 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@746 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/ffmpeg/producer/input.cpp

index 4bf1b8abf6aecbf662010eb21216729c7aef6528..4116034a58058c2db113e665b1fcea3796e274ea 100644 (file)
@@ -193,7 +193,7 @@ private:
                if(codec == nullptr)\r
                        return nullptr;\r
                        \r
-               if((-avcodec_open((*stream)->codec, codec)) > 0)                \r
+               if(avcodec_open((*stream)->codec, codec) < 0)           \r
                        return nullptr;\r
                \r
                s_index = (*stream)->index;\r
@@ -291,8 +291,8 @@ private:
        packet get_packet(tbb::concurrent_bounded_queue<packet>& buffer)\r
        {\r
                packet packet;\r
-               buffer.try_pop(packet);\r
-               cond_.notify_all();\r
+               if(buffer.try_pop(packet))\r
+                       cond_.notify_all();\r
                return packet;\r
        }\r
 \r