[SCM] libav/experimental: Forgot this, which is needed for merging field pics too.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:15:18 UTC 2013


The following commit has been merged in the experimental branch:
commit bdd745da60f8f1f4ae5d0a96d3874d3d58eab9c7
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Feb 20 19:48:25 2008 +0000

    Forgot this, which is needed for merging field pics too.
    
    Originally committed as revision 12161 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index cc423b7..5b48b1c 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -103,14 +103,6 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
                                 s->repeat_pict = 1;
                             }
                         }
-
-                        /* the packet only represents half a frame
-                           XXX,FIXME maybe find a different solution */
-                        if(picture_structure != 3){
-                            s->repeat_pict = -1;
-                            s->parity = picture_structure-1;
-                        }else
-                            s->parity = !top_field_first;
                     }
                     break;
                 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list