diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-05 00:11:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-05 00:11:57 +0100 |
| commit | 707138593af5c4783035d0b9cc2d7c8cb2137dfa (patch) | |
| tree | 7ead2e3c73fd33764dede26546b0238bb40d484b /libavcodec/shorten.c | |
| parent | 2f8b6e909dd733d9b722a5266ca516a9a5ba67e9 (diff) | |
| parent | dc6d0430503ecd7ed0d81276f977b26b4c4bd916 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcmenc: cosmetics: pretty-printing
ac3dec: cosmetics: pretty-printing
yuv4mpeg: cosmetics: pretty-printing
shorten: remove dead initialization
roqvideodec: set AVFrame reference before reget_buffer.
bmp: fix some 1bit samples.
latmdec: add fate test for audio config change
oma: PCM support
oma: better format detection with small probe buffer
oma: clearify ambiguous if condition
wavpack: Properly clip samples during lossy decode
Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
Cleaned pixdesc.c file in libavutil
zmbv.c: coding style clean-up.
xan.c: coding style clean-up.
mpegvideo.c: code cleanup - first 500 lines.
Conflicts:
Changelog
libavcodec/adpcmenc.c
libavcodec/bmp.c
libavcodec/zmbv.c
libavutil/log.c
libavutil/pixdesc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 26ce6fe885..f0a173cc7e 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -331,7 +331,6 @@ static int read_header(ShortenContext *s) s->lpcqoffset = 0; s->blocksize = DEFAULT_BLOCK_SIZE; - s->channels = 1; s->nmean = -1; s->version = get_bits(&s->gb, 8); s->internal_ftype = get_uint(s, TYPESIZE); |