diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 03:28:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 03:28:00 +0100 |
| commit | a92cdd8963459d108d701ea7a77a4e2074278276 (patch) | |
| tree | 02b8bc86af730a88834ad084dba71cd1fbbeda48 /libavcodec/utils.c | |
| parent | f86da592c3399c749442d8e70d9aef346dac3464 (diff) | |
| parent | dfeef3a209ecb3dcf01a1ad14e7fc4586e630e93 (diff) | |
| download | ffmpeg-a92cdd8963459d108d701ea7a77a4e2074278276.tar.gz | |
Merge branch 'release/0.8' into release/0.7
* release/0.8:
cook: check js_subband_start for validity
avcodec_align_dimensions2: Ensure cinepak has large enough buffers.
Update for 0.8.14
qdm2: increase noise_table size
wma: check byte_offset_bits
tiff: check bppcount
vqavideo: fix return type
Conflicts:
Doxyfile
RELEASE
VERSION
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0098e2bdbb..8eca9c67eb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -177,9 +177,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l case PIX_FMT_PAL8: case PIX_FMT_BGR8: case PIX_FMT_RGB8: - if(s->codec_id == CODEC_ID_SMC){ - w_align=4; - h_align=4; + if (s->codec_id == CODEC_ID_SMC || + s->codec_id == CODEC_ID_CINEPAK) { + w_align = 4; + h_align = 4; } break; case PIX_FMT_BGR24: @@ -188,6 +189,12 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l h_align=4; } break; + case PIX_FMT_RGB24: + if (s->codec_id == CODEC_ID_CINEPAK) { + w_align = 4; + h_align = 4; + } + break; default: w_align= 1; h_align= 1; |