Mercurial > libavcodec.hg

changeset 2561:eb72c01df6ed libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l (compile fix)
author lorenm
date Sat, 12 Mar 2005 03:10:44 +0000
parents bfba825ee300
children d0a58dca5ad2
files h264.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Fri Mar 11 02:14:44 2005 +0000
+++ b/h264.c	Sat Mar 12 03:10:44 2005 +0000
@@ -6536,10 +6536,10 @@
     }
 
     {
-//#define DECODE_ORDER
         Picture *out = s->current_picture_ptr;
+#if 0 //decode order
         *data_size = sizeof(AVFrame);
-#ifndef DECODE_ORDER
+#else
         /* Sort B-frames into display order */
         Picture *cur = s->current_picture_ptr;
         Picture *prev = h->delayed_output_pic;
@@ -6595,6 +6595,8 @@
 
         if(prev == out && !dropped_frame)
             *data_size = 0;
+        else
+            *data_size = sizeof(AVFrame);
         if(prev && prev != out && prev->reference == 1)
             prev->reference = 0;
         h->delayed_output_pic = out;