diff options
| author | Jeff Downs <heydowns@borg.com> | 2007-10-06 15:47:02 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2007-10-06 15:47:02 +0000 |
| commit | 8a11a96987f5088050c2172a98af2d8fe75513d4 (patch) | |
| tree | 249134849cc55217df2cf53394a1888ab34725f9 /libavcodec/h264.c | |
| parent | fa178ed2a4f7a42eaad8236dd73f28c6d426df6d (diff) | |
| download | ffmpeg-8a11a96987f5088050c2172a98af2d8fe75513d4.tar.gz | |
Edge emulation for fields. Part of PAFF implementation
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30
Originally committed as revision 10674 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b1e5bb11f6..4b8253ce22 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4096,7 +4096,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ h->slice_num = ++h0->current_slice; h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; - h->emu_edge_height= FRAME_MBAFF ? 0 : h->emu_edge_width; + h->emu_edge_height= (FRAME_MBAFF || FIELD_PICTURE) ? 0 : h->emu_edge_width; if(s->avctx->debug&FF_DEBUG_PICT_INFO){ av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s\n", |