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/mss2.c | |
| parent | 26b526e776a4ee7b88775f12c75b0a87fcc0e8e4 (diff) | |
| parent | c2f7417eeb9cc31f75e71f7be2780f90f1628d7e (diff) | |
| download | ffmpeg-streaming-2d614e9be14cb493c56448467b38865137e9e855.zip ffmpeg-streaming-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/mss2.c')
| -rw-r--r-- | libavcodec/mss2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 30bcc96..dd96394 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -778,7 +778,7 @@ static av_cold int wmv9_init(AVCodecContext *avctx) v->overlap = 0; - v->s.resync_marker = 0; + v->resync_marker = 0; v->rangered = 0; v->s.max_b_frames = avctx->max_b_frames = 0; |
