diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-06-27 12:58:40 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-06-27 12:58:40 +0000 |
| commit | 8e937a4ad1cf2e188256be4da776d90ec435c884 (patch) | |
| tree | 839c4f0fd2da96193cb6e925663f7d6a754cf488 | |
| parent | cb482d251155768a02994eee2b87746898fcf34d (diff) | |
| download | ffmpeg-8e937a4ad1cf2e188256be4da776d90ec435c884.tar.gz | |
2x100l
Originally committed as revision 1989 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg12.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 34cb39bac6..b78ae38511 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2023,14 +2023,14 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) MPV_frame_end(s); if (s->pict_type == B_TYPE || s->low_delay) { - *pict= *(AVFrame*)&s->current_picture; + *pict= *(AVFrame*)s->current_picture_ptr; ff_print_debug_info(s, s->current_picture_ptr); } else { s->picture_number++; /* latency of 1 frame for I and P frames */ /* XXX: use another variable than picture_number */ if (s->last_picture_ptr != NULL) { - *pict= *(AVFrame*)&s->last_picture; + *pict= *(AVFrame*)s->last_picture_ptr; ff_print_debug_info(s, s->last_picture_ptr); } } diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index fc8bb60ec6..0d8c571203 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1025,7 +1025,7 @@ void MPV_frame_end(MpegEncContext *s) { int i; /* draw edge for correct motion prediction if outside */ - if(s->codec_id!=CODEC_ID_SVQ1){ + if(s->codec_id!=CODEC_ID_SVQ1 && s->codec_id != CODEC_ID_MPEG1VIDEO){ if (s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH ); draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); |