diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-21 02:46:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-21 03:40:53 +0100 |
| commit | 3be1a4ba9a9d926674b33051d6539fe8d8a4106c (patch) | |
| tree | c92779c80a98d94133dde283a86c4b4547dc16ab /libavcodec/mpegvideo_enc.c | |
| parent | 134aaa79f7f1ce1df64afc7d10d2b3de77df7b08 (diff) | |
| parent | 37c0dc626d2f8254ef623d987eb5077f9120755f (diff) | |
| download | ffmpeg-streaming-3be1a4ba9a9d926674b33051d6539fe8d8a4106c.zip ffmpeg-streaming-3be1a4ba9a9d926674b33051d6539fe8d8a4106c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: always align height by 32 pixel
raw: add 10bit YUV definitions
nut: support 10bit YUV
mpegvideo_enc: separate declarations and statements
oma: make header compile standalone
vp3: Reorder some functions to fix VP3 build with Theora disabled.
build: fix standalone compilation of ADX encoder
build: fix standalone compilation of ADPCM decoders
build: fix standalone compilation of mpc7/mpc8 decoders
4xm: Use bytestream2 functions to prevent overreads
bytestream: add a new set of bytestream functions with overread checking
mpegts: Suppress invalid timebase warnings on DMB streams.
mpegts: Fix typo in handling sections in the PMT.
vc1dec: Use the right pointer type for the tmp pointer
Conflicts:
libavcodec/4xm.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 83c4932..690df08 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1213,10 +1213,11 @@ no_output_pic: if (s->reordered_input_picture[0]->f.type == FF_BUFFER_TYPE_SHARED || s->avctx->rc_buffer_size) { // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable + Picture *pic; int i= ff_find_unused_picture(s, 0); if (i < 0) return i; - Picture *pic= &s->picture[i]; + pic = &s->picture[i]; pic->f.reference = s->reordered_input_picture[0]->f.reference; if(ff_alloc_picture(s, pic, 0) < 0){ |
