aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-26 15:47:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-11-04 13:36:28 +0100
commitc4a34f402528502a857e134a670421048c388c93 (patch)
tree04771fa598c2e82d0a93ece2fbabf27b43e660e8
parentcba03dc66730cab43a4257bc027d35f09c393f62 (diff)
downloadffmpeg-c4a34f402528502a857e134a670421048c388c93.tar.gz
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>
-rw-r--r--libavcodec/snow.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 43a71904eb..86ab710f80 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -1917,8 +1917,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i
static void halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *frame){
int p,x,y;
- assert(!(s->avctx->flags & CODEC_FLAG_EMU_EDGE));
-
for(p=0; p<3; p++){
int is_chroma= !!p;
int w= s->avctx->width >>is_chroma;
@@ -1975,7 +1973,7 @@ static int frame_start(SnowContext *s){
int w= s->avctx->width; //FIXME round up to x16 ?
int h= s->avctx->height;
- if(s->current_picture.data[0]){
+ if(s->current_picture.data[0] && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)){
s->dsp.draw_edges(s->current_picture.data[0],
s->current_picture.linesize[0], w , h ,
EDGE_WIDTH , EDGE_WIDTH , EDGE_TOP | EDGE_BOTTOM);