diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 14:49:12 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 14:49:49 +0100 |
commit | afb4bc3d291f4cc6b67b635305d30a097cb2a82d (patch) | |
tree | abf13c6844cf4a0921b6fb91edd607717c883829 /libavcodec/bfin | |
parent | 91f359292a52b7acf3785ea4c399b20d8fbd24e5 (diff) | |
parent | 61d36761efda663c5ce07a5ec13659431b08f3c2 (diff) | |
download | ffmpeg-streaming-afb4bc3d291f4cc6b67b635305d30a097cb2a82d.zip ffmpeg-streaming-afb4bc3d291f4cc6b67b635305d30a097cb2a82d.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Simplify code by using avio_wb24
bfin: unbreak compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
-rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 1 | ||||
-rw-r--r-- | libavcodec/bfin/vp3_bfin.h | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index 6b2fc56..d936479 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -22,6 +22,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/vp3dsp.h" +#include "libavcodec/dsputil.h" #include "dsputil_bfin.h" #include "vp3_bfin.h" diff --git a/libavcodec/bfin/vp3_bfin.h b/libavcodec/bfin/vp3_bfin.h new file mode 100644 index 0000000..f0bf824 --- /dev/null +++ b/libavcodec/bfin/vp3_bfin.h @@ -0,0 +1,29 @@ +/* + * 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_BFIN_VP3_BFIN_H +#define AVCODEC_BFIN_VP3_BFIN_H + +#include <stdint.h> + +void ff_bfin_vp3_idct(int16_t *block); +void ff_bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block); +void ff_bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block); + +#endif /* AVCODEC_BFIN_VP3_BFIN_H */ |