diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 02:11:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 02:34:18 +0100 |
| commit | 7c29313b387392fa305365e855fa408cd28c276e (patch) | |
| tree | 328f30ad4a4e6b606bbbffc1f15f22d2044affb3 /libavcodec/4xm.c | |
| parent | f371396dfb95c116a05e9b9f690fa916bb2d815e (diff) | |
| parent | 2a216ca2ef29282cac9003a716b469b8c80c0a15 (diff) | |
| download | ffmpeg-7c29313b387392fa305365e855fa408cd28c276e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
APIchanges: fill in revision for AVFrame.age deprecation
avcodec: deprecate AVFrame.age
4xm: remove unneeded check for remaining unused data.
lavf: force threads to 1 in avformat_find_stream_info()
swscale: fix overflows in vertical scaling at top/bottom edges.
lavf: add OpenMG audio muxer.
omadec: split data that will be used in the muxer to a separate file.
lavf: rename oma.c -> omadec.c
tmv decoder: set correct pix_fmt
Conflicts:
Changelog
doc/APIchanges
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/oma.c
libavformat/version.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index f854f1cfb5..43f6a21ea8 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -440,15 +440,6 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){ dst += 8*stride; } - if( bitstream_size != (get_bits_count(&f->gb)+31)/32*4 - || (((const char*)f->wordstream - (const char*)buf + 2)&~2) != extra + bitstream_size + wordstream_size - || (((const char*)f->bytestream - (const char*)buf + 3)&~3) != extra + bitstream_size + wordstream_size + bytestream_size) - av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n", - bitstream_size - (get_bits_count(&f->gb)+31)/32*4, - -(((const char*)f->bytestream - (const char*)buf + 3)&~3) + (extra + bitstream_size + wordstream_size + bytestream_size), - -(((const char*)f->wordstream - (const char*)buf + 2)&~2) + (extra + bitstream_size + wordstream_size) - ); - return 0; } |