diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 23:57:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-06 23:57:11 +0200 |
| commit | c3b6cc61e502b8df0d5bc6b9058dfc482a08d42a (patch) | |
| tree | a03500dd560ac0aceadc3dbb485631a315ad89bf /libswscale/swscale_internal.h | |
| parent | 4e59c8ecf1433b85b539c5e89bb68cfe8b839866 (diff) | |
| parent | f02f745e4aa070e5fabf1156b75c340171304933 (diff) | |
| download | ffmpeg-c3b6cc61e502b8df0d5bc6b9058dfc482a08d42a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffserver: remove unused variable.
Remove unused and outdated TODO file.
gitignore: Drop individual .d ignore; it is already covered by a wildcard.
lavf: deprecate AVStream.quality.
bink: pass Bink version to audio decoder through extradata instead of codec_tag.
libpostproc: Remove disabled code.
flashsv: improve some comments and fix some wrong ones
flashsv: Eliminate redundant variable indirection.
flashsv: set reference frame type to full frame
flashsv: replace bitstream description by a link to the specification
flashsv: convert a debug av_log into av_dlog
flashsv: simplify condition
flashsv: return more meaningful error values
flashsv: cosmetics: break some overly long lines
flashsv: cosmetics: drop some unnecessary parentheses
swscale: amend documentation to mention use of native depth for scaling.
eval: add missing comma to tests.
eval: fix memleak.
H.264: make loopfilter bS const where applicable
Conflicts:
libavcodec/binkaudio.c
libavformat/bink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 86ab4becb5..73dc25d547 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -435,7 +435,10 @@ typedef struct SwsContext { * @param dstW width of destination image * @param src pointer to source data to be scaled. If scaling depth * is 8, this is 8bpp in 8bpp (uint8_t) width. If scaling - * depth is 16, this is 16bpp in 16bpp (uint16_t) depth. + * depth is 16, this is native depth in 16bbp (uint16_t) + * width. In other words, for 9-bit YUV input, this is + * 9bpp, for 10-bit YUV input, this is 10bpp, and for + * 16-bit RGB or YUV, this is 16bpp. * @param filter filter coefficients to be used per output pixel for * scaling. This contains 14bpp filtering coefficients. * Guaranteed to contain dstW * filterSize entries. |