Browse code

snow: emu edge support Fixes Ticket592

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4416931fc069332e267ab6df037a1227c051d7b1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2011/10/26 22:47:14
Showing 1 changed files
... ...
@@ -1917,8 +1917,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i
1917 1917
 static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *frame){
1918 1918
     int p,x,y;
1919 1919
 
1920
-    assert(!(s->avctx->flags & CODEC_FLAG_EMU_EDGE));
1921
-
1922 1920
     for(p=0; p<3; p++){
1923 1921
         int is_chroma= !!p;
1924 1922
         int w= s->avctx->width  >>is_chroma;
... ...
@@ -1975,7 +1973,7 @@ static int frame_start(SnowContext *s){
1975 1975
    int w= s->avctx->width; //FIXME round up to x16 ?
1976 1976
    int h= s->avctx->height;
1977 1977
 
1978
-    if(s->current_picture.data[0]){
1978
+    if(s->current_picture.data[0] && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)){
1979 1979
         s->dsp.draw_edges(s->current_picture.data[0],
1980 1980
                           s->current_picture.linesize[0], w   , h   ,
1981 1981
                           EDGE_WIDTH  , EDGE_WIDTH  , EDGE_TOP | EDGE_BOTTOM);