diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 11:22:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 11:59:20 +0100 |
| commit | e13d5e9a4b5b4de065b00b1caea850cd47fd4b18 (patch) | |
| tree | 13bf2f01763823c4e4da6374acadc95b3f8bc121 /libavcodec/tiffenc.c | |
| parent | 26afdbcfc0ecd646c6d829b781e0a53d6b289186 (diff) | |
| parent | 5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2 (diff) | |
| download | ffmpeg-e13d5e9a4b5b4de065b00b1caea850cd47fd4b18.tar.gz | |
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiffenc.c')
| -rw-r--r-- | libavcodec/tiffenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index d4402859f0..61294b9207 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -293,8 +293,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, case AV_PIX_FMT_YUV410P: case AV_PIX_FMT_YUV411P: s->photometric_interpretation = 6; - avcodec_get_chroma_sub_sample(avctx->pix_fmt, - &shift_h, &shift_v); + avcodec_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v); s->subsampling[0] = 1 << shift_h; s->subsampling[1] = 1 << shift_v; is_yuv = 1; |