diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-04-25 18:29:06 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-04-25 18:29:06 +0000 |
| commit | 644a92626a94d6f24110309cb2dc7d9ec3e79f25 (patch) | |
| tree | 536101865dc2b937f4e4587909c299dc6f434b84 /libavcodec/rv10.c | |
| parent | 3ca4b65479f587d5d79080699d16cdd5c9ec7e0a (diff) | |
| download | ffmpeg-644a92626a94d6f24110309cb2dc7d9ec3e79f25.tar.gz | |
PIX_FMT_NONE and related fixes
Originally committed as revision 4161 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
| -rw-r--r-- | libavcodec/rv10.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index c5068c5685..8183391e93 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -560,7 +560,9 @@ static int rv10_decode_init(AVCodecContext *avctx) if(avctx->debug & FF_DEBUG_PICT_INFO){ av_log(avctx, AV_LOG_DEBUG, "ver:%X ver0:%X\n", avctx->sub_id, avctx->extradata_size >= 4 ? ((uint32_t*)avctx->extradata)[0] : -1); } - + + avctx->pix_fmt = PIX_FMT_YUV420P; + if (MPV_common_init(s) < 0) return -1; @@ -576,8 +578,6 @@ static int rv10_decode_init(AVCodecContext *avctx) rv_chrom_code, 2, 2, 1); done = 1; } - - avctx->pix_fmt = PIX_FMT_YUV420P; return 0; } |