[SCM] libav/experimental: - Bug fix in map stream parser

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:31:43 UTC 2013


The following commit has been merged in the experimental branch:
commit a5dc85efb83a891070eb5f7a8f24834539fdf5df
Author: Juanjo <pulento at users.sourceforge.net>
Date:   Sat May 11 23:27:14 2002 +0000

    - Bug fix in map stream parser
    
    Originally committed as revision 483 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 9990aef..6a5b74a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -489,8 +489,12 @@ static void do_video_out(AVFormatContext *s,
             ret = avcodec_encode_video(enc, 
                                        video_buffer, sizeof(video_buffer), 
                                        picture);
+            //enc->frame_number = enc->r_pict_num;
             s->format->write_packet(s, ost->index, video_buffer, ret, 0);
             *frame_size = ret;
+            //fprintf(stderr,"\nFrame: %3d %3d size: %5d type: %d",
+            //        enc->frame_number-1, enc->r_pict_num, ret,
+            //        enc->pict_type);
         } else {
             write_picture(s, ost->index, picture, enc->pix_fmt, enc->width, enc->height);
         }
@@ -1466,7 +1470,8 @@ void opt_map(const char *arg)
     m->file_index = strtol(arg, (char **)&p, 0);
     if (*p)
         p++;
-    m->stream_index = strtol(arg, (char **)&p, 0);
+
+    m->stream_index = strtol(p, (char **)&p, 0);
 }
 
 void opt_recording_time(const char *arg)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list