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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 69dec5f11d..fffa36a456 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2425,6 +2425,7 @@ void ff_mpeg_flush(AVCodecContext *avctx){ s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL; s->mb_x= s->mb_y= 0; + s->closed_gop= 0; s->parse_context.state= -1; s->parse_context.frame_start_found= 0; |