aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-11 21:49:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-11 21:49:42 +0100
commit82c8abb34f13422b8302329f70f5399549a82b32 (patch)
treeb53c856a24518a1231f2071f5dfcd49e5d098a26
parent7801f3e509acf4adee00ac765c54a8835e8dba8e (diff)
parent3eed35addb461c42471e0367bb6cd68d8ffd3aec (diff)
downloadffmpeg-82c8abb34f13422b8302329f70f5399549a82b32.tar.gz
Merge commit '3eed35addb461c42471e0367bb6cd68d8ffd3aec' into release/0.10
* commit '3eed35addb461c42471e0367bb6cd68d8ffd3aec': svq1enc: Set picture_structure correctly Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/svq1enc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index d478b5546b..3cc73d0a87 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -486,6 +486,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
s->avctx= avctx;
s->m.avctx= avctx;
+ s->m.picture_structure = PICT_FRAME;
s->m.me.temp =
s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));