diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-02-17 00:25:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 00:28:42 +0100 |
| commit | 1d6f6ff4d9faf309b1ea38dc11b38c90b72b03fd (patch) | |
| tree | b0453333c281e2e0b6731adb6a9113c56adcf8a5 | |
| parent | a56fd9edab5748a86dc4207b9ddecbe47d04b770 (diff) | |
| download | ffmpeg-1d6f6ff4d9faf309b1ea38dc11b38c90b72b03fd.tar.gz | |
h264: don't initialize missing pictures when using a hwaccel
Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 84183108dd..89fc2227ae 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1704,7 +1704,7 @@ int ff_h264_frame_start(H264Context *h) if ((ret = alloc_picture(h, pic)) < 0) return ret; - if(!h->sync) + if(!h->sync && !h->avctx->hwaccel) avpriv_color_frame(&pic->f, c); h->cur_pic_ptr = pic; |