diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 15:52:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 15:57:28 +0200 |
| commit | a9bd51b1e647d7ec0b7661e19b87ade86098b38c (patch) | |
| tree | 37682f77a88bc8e09eb97fbc923192292a1abbe4 /libswscale/output.c | |
| parent | a33ed6bc74b6b8ada925c76c4084afcf8870a048 (diff) | |
| parent | 9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc (diff) | |
| download | android_external_ffmpeg-a9bd51b1e647d7ec0b7661e19b87ade86098b38c.tar.gz android_external_ffmpeg-a9bd51b1e647d7ec0b7661e19b87ade86098b38c.tar.bz2 android_external_ffmpeg-a9bd51b1e647d7ec0b7661e19b87ade86098b38c.zip | |
Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'
* commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc':
mpegvideo: fix indentation
sws: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavcodec/mpegvideo.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/output.c')
| -rw-r--r-- | libswscale/output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index 15591ae285..8306298d64 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1270,12 +1270,13 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, yuv2packedX_fn *yuv2packedX) { enum AVPixelFormat dstFormat = c->dstFormat; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat); if (is16BPS(dstFormat)) { *yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c; *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c; } else if (is9_OR_10BPS(dstFormat)) { - if (av_pix_fmt_descriptors[dstFormat].comp[0].depth_minus1 == 8) { + if (desc->comp[0].depth_minus1 == 8) { *yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c; *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c; } else { |