diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-26 04:47:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-26 05:11:21 +0100 |
| commit | 305e4b35ea7b643ab3ce8a37fa8cb464e8adeb3f (patch) | |
| tree | 9e3773a72155b936e1ca66d4f089fa1b7eeeb791 /libavcodec/fraps.c | |
| parent | 8e039121335f482234214bc4e0322ac72c1089ef (diff) | |
| parent | 0a9efe4c6eb48bf863e2e630b3ad907a198961c5 (diff) | |
| download | ffmpeg-305e4b35ea7b643ab3ce8a37fa8cb464e8adeb3f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
mlp_parser: fix the channel mask value used for the top surround channel
vorbisenc: check all allocations for failure
roqaudioenc: return AVERROR codes instead of -1
roqaudioenc: set correct bit rate
roqaudioenc: use AVCodecContext.frame_size correctly.
roqaudioenc: remove unneeded sample_fmt check
ra144enc: use int16_t* for input samples rather than void*
ra144enc: set AVCodecContext.coded_frame
ra144enc: remove unneeded sample_fmt check
nellymoserenc: set AVCodecContext.coded_frame
nellymoserenc: improve error checking in encode_init()
nellymoserenc: return AVERROR codes instead of -1
libvorbis: improve error checking in oggvorbis_encode_init()
mpegaudioenc: return AVERROR codes instead of -1
libfaac: improve error checking and handling in Faac_encode_init()
avutil: add AVERROR_UNKNOWN
check for coded_frame allocation failure in several audio encoders
audio encoders: do not set coded_frame->key_frame.
g722enc: check for trellis data allocation error
libspeexenc: export encoder delay through AVCodecContext.delay
...
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/fraps.c
libavcodec/kgv1dec.c
libavcodec/libfaac.c
libavcodec/libgsm.c
libavcodec/libvorbis.c
libavcodec/mlp_parser.c
libavcodec/roqaudioenc.c
libavcodec/vorbisenc.c
libavutil/avutil.h
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fraps.c')
| -rw-r--r-- | libavcodec/fraps.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index da976c857d..45d95c9c24 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -142,7 +142,7 @@ static int decode_frame(AVCodecContext *avctx, int i, j, is_chroma; const int planes = 3; uint8_t *out; - + enum PixelFormat pix_fmt; header = AV_RL32(buf); version = header & 0xff; @@ -157,8 +157,6 @@ static int decode_frame(AVCodecContext *avctx, buf += header_size; - avctx->pix_fmt = version & 1 ? PIX_FMT_BGR24 : PIX_FMT_YUVJ420P; - if (version < 2) { unsigned needed_size = avctx->width*avctx->height*3; if (version == 0) needed_size /= 2; @@ -205,6 +203,13 @@ static int decode_frame(AVCodecContext *avctx, f->key_frame = 1; f->reference = 0; f->buffer_hints = FF_BUFFER_HINTS_VALID; + + pix_fmt = version & 1 ? PIX_FMT_BGR24 : PIX_FMT_YUVJ420P; + if (avctx->pix_fmt != pix_fmt && f->data[0]) { + avctx->release_buffer(avctx, f); + } + avctx->pix_fmt = pix_fmt; + if (ff_thread_get_buffer(avctx, f)) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; |