diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:04:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:04:14 +0200 |
| commit | fe906830fd58cd281bc94c59081f66074ea69dff (patch) | |
| tree | 0739de4ffbcdae3ca1a1ad72bf457c0170c54c01 /libavcodec/mpeg12.c | |
| parent | 2b0cdb7364fbe1e8a7e97d36ba36dc67fb24095e (diff) | |
| download | ffmpeg-fe906830fd58cd281bc94c59081f66074ea69dff.tar.gz | |
Revert "mpeg12: move closed_gop from MpegEncContext to Mpeg1Context"
This reverts commit 3fc08304322ce3ed0e4a71efde78ae5e0d5c910c.
The revert is done because the reasoning behind the commit was
flawed, closed_gop is not mpeg1/2 specific.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index b5dfc42cc7..68d44673d0 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2158,7 +2158,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, time_code_seconds = get_bits(&s->gb, 6); time_code_pictures = get_bits(&s->gb, 6); - s1->closed_gop = get_bits1(&s->gb); + s->closed_gop = get_bits1(&s->gb); /*broken_link indicate that after editing the reference frames of the first B-Frames after GOP I-Frame are missing (open gop)*/ @@ -2438,7 +2438,7 @@ static int decode_chunks(AVCodecContext *avctx, if (s2->last_picture_ptr == NULL) { /* Skip B-frames if we do not have reference frames and gop is not closed */ if (s2->pict_type == AV_PICTURE_TYPE_B) { - if (!s->closed_gop) + if (!s2->closed_gop) break; } } @@ -2523,7 +2523,6 @@ static void flush(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; s->sync=0; - s->closed_gop = 0; ff_mpeg_flush(avctx); } |