diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-28 04:31:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-28 13:20:03 +0200 |
| commit | 90bcbc791f431dc7545e837e1a9aeca0a3e760a6 (patch) | |
| tree | d808a07fb5172e19a771b1f8f3f960d6b4720c52 | |
| parent | b35a846923e554e49c593e26f746016558107a59 (diff) | |
| download | ffmpeg-90bcbc791f431dc7545e837e1a9aeca0a3e760a6.tar.gz | |
Revert "qpeg: use reget_buffer() in decode_frame()"
This reverts commit f4e043ff63935a71b98a36bc98b501c36ceadb92.
| -rw-r--r-- | libavcodec/qpeg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 8c1b7e065a..dda5525f2e 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -259,9 +259,12 @@ static int decode_frame(AVCodecContext *avctx, int delta; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); - p->reference = 3; - if (avctx->reget_buffer(avctx, p) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if(p->data[0]) + avctx->release_buffer(avctx, p); + + p->reference= 0; + if(avctx->get_buffer(avctx, p) < 0){ + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } outdata = a->pic.data[0]; |