[lav/encoder] bail if the encoded frame queue is empty

mean00 · Apr 4, 2017 · 9648e43 · 9648e43
1 parent ecb1382
commit 9648e43
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp b/avidemux_core/ADM_coreVideoEncoder/src/ADM_coreVideoEncoderFFmpeg.cpp
@@ -442,7 +442,7 @@ bool ADM_coreVideoEncoderFFmpeg::postEncode(ADMBitstream *out, uint32_t size)
         ADM_warning("No picture...\n");
         return false;
     }
-    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d\n",out->out_quantizer,pict_type,keyframe);
+    aprintf("[ffMpeg4] Out Quant :%d, pic type %d keyf %d %p\n",out->out_quantizer,pict_type,keyframe,_context->coded_frame);
     out->len=size;
     out->flags=0;
     if(keyframe)
@@ -459,10 +459,17 @@ bool ADM_coreVideoEncoderFFmpeg::postEncode(ADMBitstream *out, uint32_t size)
             {
                 out->dts=out->pts=queueOfDts[0];
                 queueOfDts.erase(queueOfDts.begin());
+            }else
+            {
+                out->dts=out->pts=lastDts+ source->getInfo()->frameIncrement;
+                return false; // probably empty now
             }
+
     } else
-    if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
-        return false;
+    {
+        if(!getRealPtsFromInternal(_context->coded_frame->pts,&(out->dts),&(out->pts)))
+                return false;
+    }
     // update lastDts
     lastDts=out->dts;