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/swscale.c | |
| parent | a33ed6bc74b6b8ada925c76c4084afcf8870a048 (diff) | |
| parent | 9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc (diff) | |
| download | ffmpeg-a9bd51b1e647d7ec0b7661e19b87ade86098b38c.tar.gz | |
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/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7c4324417d..8aab60a9de 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -66,10 +66,11 @@ static void hScale16To19_c(SwsContext *c, int16_t *_dst, int dstW, const uint8_t *_src, const int16_t *filter, const int32_t *filterPos, int filterSize) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat); int i; int32_t *dst = (int32_t *) _dst; const uint16_t *src = (const uint16_t *) _src; - int bits = av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1; + int bits = desc->comp[0].depth_minus1; int sh = bits - 4; if((isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8) && av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1<15) @@ -92,9 +93,10 @@ static void hScale16To15_c(SwsContext *c, int16_t *dst, int dstW, const uint8_t *_src, const int16_t *filter, const int32_t *filterPos, int filterSize) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat); int i; const uint16_t *src = (const uint16_t *) _src; - int sh = av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1; + int sh = desc->comp[0].depth_minus1; if(sh<15) sh= isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1; @@ -755,7 +757,7 @@ static void reset_ptr(const uint8_t *src[], int format) static int check_image_pointers(const uint8_t * const data[4], enum AVPixelFormat pix_fmt, const int linesizes[4]) { - const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); int i; for (i = 0; i < 4; i++) { |