diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-29 14:42:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-29 14:45:55 +0200 |
| commit | 8672fc7b0453098d862bb1c0caafab4823ee0b4e (patch) | |
| tree | 61e47d15de63bd72f6e6a73ecfb8697bb4b687b1 /libavcodec/cavsdec.c | |
| parent | 74bd0cf49c9c0bee8d4f3d3a98a7343c2ff5b94c (diff) | |
| parent | b146d74730ab9ec5abede9066f770ad851e45fbc (diff) | |
| download | ffmpeg-8672fc7b0453098d862bb1c0caafab4823ee0b4e.tar.gz | |
Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'
* commit 'b146d74730ab9ec5abede9066f770ad851e45fbc':
indeo4: update AVCodecContext width/height on size change
dfa: check that the caller set width/height properly.
indeo5dec: Make sure we have had a valid gop header.
cavsdec: check for changing w/h.
lavc: set channel count from channel layout in avcodec_open2().
doc/platform: Rework the Visual Studio linking section
doc/faq: Change the Visual Studio entry to reflect current status
doc/platform: Replace Visual Studio section with build instructions
doc/platform: Nuke section on linking static MinGW-built libs with MSVC
doc/platform: Remove false claim about MinGW installer
doc/platform: Mention MinGW-w64
dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()
mpegaudiodec: fix short_start calculation
Conflicts:
doc/faq.texi
doc/platform.texi
libavcodec/cavsdec.c
libavcodec/indeo5.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 4e69176c2f..4119303835 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1073,11 +1073,12 @@ static int decode_seq_header(AVSContext *h) { h->profile = get_bits(&s->gb,8); h->level = get_bits(&s->gb,8); skip_bits1(&s->gb); //progressive sequence - width = get_bits(&s->gb,14); - height = get_bits(&s->gb,14); + + width = get_bits(&s->gb, 14); + height = get_bits(&s->gb, 14); if ((s->width || s->height) && (s->width != width || s->height != height)) { av_log_missing_feature(s, "Width/height changing in CAVS is", 0); - return -1; + return AVERROR_PATCHWELCOME; } if (width <= 0 || height <= 0) { av_log(s, AV_LOG_ERROR, "Dimensions invalid\n"); @@ -1085,6 +1086,7 @@ static int decode_seq_header(AVSContext *h) { } s->width = width; s->height = height; + skip_bits(&s->gb,2); //chroma format skip_bits(&s->gb,3); //sample_precision h->aspect_ratio = get_bits(&s->gb,4); |