summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-24 01:04:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-24 01:04:14 +0200
commitfe906830fd58cd281bc94c59081f66074ea69dff (patch)
tree0739de4ffbcdae3ca1a1ad72bf457c0170c54c01 /libavcodec/mpeg12.h
parent2b0cdb7364fbe1e8a7e97d36ba36dc67fb24095e (diff)
downloadffmpeg-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.h')
-rw-r--r--libavcodec/mpeg12.h1
1 files changed, 0 insertions, 1 deletions
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;