diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 23:04:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 23:28:31 +0200 |
| commit | b5da7d4c1a7f08f89aece651a8f0f8c4963e5ad9 (patch) | |
| tree | c5ade4afd26c2cbd5fd7d5442e044e688724269a /libavcodec/eaidct.h | |
| parent | a85b4a5696787e36df8d7c805de8f86ea6365acb (diff) | |
| parent | 6774247a9d7d15033c2b80118c03cb0cb10027df (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: Drop pointless "format" from container long names
swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
wv: K&R formatting cosmetics
configure: Add missing descriptions to help output
h264_ps: declare array of colorspace strings on its own line.
fate: amix: specify f32 sample format for comparison
tiny_psnr: support 32-bit float samples
eamad/eatgq/eatqi: call special EA IDCT directly
eamad: remove use of MpegEncContext
mpegvideo: remove unnecessary inclusions of faandct.h
af_asyncts: avoid overflow in out_size with large delta values
af_asyncts: add first_pts option
Conflicts:
configure
libavcodec/eamad.c
libavcodec/h264_ps.c
libavformat/crcenc.c
libavformat/ffmdec.c
libavformat/ffmenc.c
libavformat/framecrcenc.c
libavformat/md5enc.c
libavformat/nutdec.c
libavformat/rawenc.c
libavformat/yuv4mpeg.c
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eaidct.h')
| -rw-r--r-- | libavcodec/eaidct.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libavcodec/eaidct.h b/libavcodec/eaidct.h new file mode 100644 index 0000000000..a436673e88 --- /dev/null +++ b/libavcodec/eaidct.h @@ -0,0 +1,27 @@ +/* + * This file is part of FFmpeg + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_EAIDCT_H +#define AVCODEC_EAIDCT_H + +#include <stdint.h> +#include "dsputil.h" + +void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block); + +#endif /* AVCODEC_EAIDCT_H */ |