From fe906830fd58cd281bc94c59081f66074ea69dff Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 24 Oct 2011 01:04:14 +0200 Subject: 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 --- libavcodec/mpeg12.h | 1 - 1 file changed, 1 deletion(-) (limited to 'libavcodec/mpeg12.h') diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 2f75d39454..89db30b18f 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -42,7 +42,6 @@ typedef struct Mpeg1Context { AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame? int full_pel[2]; - int closed_gop; ///< GOP is closed int tmpgexs; } Mpeg1Context; -- cgit v1.2.3