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/imgconvert.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/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index de64b87743..43eeba7082 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -431,12 +431,6 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift = desc->log2_chroma_h; } -int ff_is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - return desc->flags & PIX_FMT_HWACCEL; -} - int avpicture_fill(AVPicture *picture, const uint8_t *ptr, enum AVPixelFormat pix_fmt, int width, int height) { |