diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:48:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 00:49:34 +0100 |
| commit | 2d614e9be14cb493c56448467b38865137e9e855 (patch) | |
| tree | 14d22cd1866e8eccf57c632cf447636bfeb22230 /libavcodec/vc1.h | |
| parent | 26b526e776a4ee7b88775f12c75b0a87fcc0e8e4 (diff) | |
| parent | c2f7417eeb9cc31f75e71f7be2780f90f1628d7e (diff) | |
| download | ffmpeg-2d614e9be14cb493c56448467b38865137e9e855.tar.gz | |
Merge commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e'
* commit 'c2f7417eeb9cc31f75e71f7be2780f90f1628d7e':
vc1: move MpegEncContext.resync_marker into VC1Context.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.h')
| -rw-r--r-- | libavcodec/vc1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index df69c77a4d..0cf4e0f9f7 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -399,6 +399,7 @@ typedef struct VC1Context{ int end_mb_x; ///< Horizontal macroblock limit (used only by mss2) int parse_only; ///< Context is used within parser + int resync_marker; ///< could this stream contain resync markers } VC1Context; /** Find VC-1 marker in buffer |