diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-11 04:02:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-11 04:08:08 +0200 |
| commit | ab8cfd45f8dcff5a9d60271b30dc4437756d5985 (patch) | |
| tree | 0f74fb858daf39079fcca2a7ebde67676234ceec /libavcodec/vc1.c | |
| parent | 2e92a34cde07ea145e4b8380259881988cf7edd3 (diff) | |
| parent | d1c5fdf8920b75f3b824368b8336f18c74b68803 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
avio: add more documentation for AVIOContext.
Parse sprite data for WMVP and WVP2, and decode sprites for the latter
Replace outdated info on the FAQ
Redefine sameq
pad: fix example explanation
gradfun: add notice from the MPlayer manual
eval: add support for trunc, ceil, and floor functions
documentation: add setdar and setsar description to filters.texi
avio: document some members of AVIOContext.
avio: document avio_close().
avio: cosmetics, vertically align comments.
avio: cosmetics, group the reading functions.
avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
avio: cosmetics, move AVIOContext to start of the file.
avio: update file header.
os: fix OpenBSD/PowerPC compilation
pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
oggdec: fix demuxing chained audio streams
fix typo
Conflicts:
doc/filters.texi
libavformat/avio.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 73f0cba042..1b1809588e 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -605,9 +605,6 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) { int pqindex, lowquant, status; - if(v->res_sprite) { - skip_bits(gb, 2); //not yet deciphered - } if(v->finterpflag) v->interpfrm = get_bits1(gb); skip_bits(gb, 2); //framecnt unused v->rangeredfrm = 0; |