2 files changed, 35 insertions, 66 deletions
diff --git a/rotord/av/avCodec.d b/rotord/av/avCodec.d
deleted file mode 100644
index 4bc3a37..0000000
--- a/rotord/av/avCodec.d
+++ /dev/null
@@ -1,66 +0,0 @@
-./avCodec.o: avCodec.cpp avCodec.h /usr/include/math.h \
- /usr/include/features.h /usr/include/i386-linux-gnu/bits/predefs.h \
- /usr/include/i386-linux-gnu/sys/cdefs.h \
- /usr/include/i386-linux-gnu/bits/wordsize.h \
- /usr/include/i386-linux-gnu/gnu/stubs.h \
- /usr/include/i386-linux-gnu/gnu/stubs-32.h \
- /usr/include/i386-linux-gnu/bits/huge_val.h \
- /usr/include/i386-linux-gnu/bits/huge_valf.h \
- /usr/include/i386-linux-gnu/bits/huge_vall.h \
- /usr/include/i386-linux-gnu/bits/inf.h \
- /usr/include/i386-linux-gnu/bits/nan.h \
- /usr/include/i386-linux-gnu/bits/mathdef.h \
- /usr/include/i386-linux-gnu/bits/mathcalls.h \
- /usr/include/i386-linux-gnu/bits/mathinline.h \
- ../ffmpeg/libavcodec/avcodec.h /usr/include/errno.h \
- /usr/include/i386-linux-gnu/bits/errno.h /usr/include/linux/errno.h \
- /usr/include/i386-linux-gnu/asm/errno.h /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h ../ffmpeg/libavutil/samplefmt.h \
- /usr/lib/gcc/i686-linux-gnu/4.7/include/stdint.h /usr/include/stdint.h \
- /usr/include/i386-linux-gnu/bits/wchar.h ../ffmpeg/libavutil/avutil.h \
- ../ffmpeg/libavutil/common.h /usr/include/ctype.h \
- /usr/include/i386-linux-gnu/bits/types.h \
- /usr/include/i386-linux-gnu/bits/typesizes.h /usr/include/endian.h \
- /usr/include/i386-linux-gnu/bits/endian.h \
- /usr/include/i386-linux-gnu/bits/byteswap.h /usr/include/xlocale.h \
- /usr/include/inttypes.h \
- /usr/lib/gcc/i686-linux-gnu/4.7/include-fixed/limits.h \
- /usr/lib/gcc/i686-linux-gnu/4.7/include-fixed/syslimits.h \
- /usr/include/limits.h /usr/include/i386-linux-gnu/bits/posix1_lim.h \
- /usr/include/i386-linux-gnu/bits/local_lim.h /usr/include/linux/limits.h \
- /usr/include/i386-linux-gnu/bits/posix2_lim.h \
- /usr/include/i386-linux-gnu/bits/xopen_lim.h \
- /usr/include/i386-linux-gnu/bits/stdio_lim.h /usr/include/stdio.h \
- /usr/lib/gcc/i686-linux-gnu/4.7/include/stddef.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/i686-linux-gnu/4.7/include/stdarg.h \
- /usr/include/i386-linux-gnu/bits/sys_errlist.h \
- /usr/include/i386-linux-gnu/bits/stdio.h \
- /usr/include/i386-linux-gnu/bits/stdio2.h /usr/include/stdlib.h \
- /usr/include/i386-linux-gnu/bits/waitflags.h \
- /usr/include/i386-linux-gnu/bits/waitstatus.h \
- /usr/include/i386-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/i386-linux-gnu/sys/select.h \
- /usr/include/i386-linux-gnu/bits/select.h \
- /usr/include/i386-linux-gnu/bits/sigset.h \
- /usr/include/i386-linux-gnu/bits/time.h \
- /usr/include/i386-linux-gnu/bits/select2.h \
- /usr/include/i386-linux-gnu/sys/sysmacros.h \
- /usr/include/i386-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/i386-linux-gnu/bits/stdlib.h /usr/include/string.h \
- /usr/include/i386-linux-gnu/bits/string3.h \
- ../ffmpeg/libavutil/attributes.h ../ffmpeg/libavutil/version.h \
- /usr/include/libavutil/avconfig.h ../ffmpeg/libavutil/mem.h \
- ../ffmpeg/libavutil/error.h ../ffmpeg/libavutil/mathematics.h \
- ../ffmpeg/libavutil/rational.h ../ffmpeg/libavutil/intfloat.h \
- ../ffmpeg/libavutil/intfloat_readwrite.h ../ffmpeg/libavutil/log.h \
- ../ffmpeg/libavutil/pixfmt.h ../ffmpeg/libavutil/version.h \
- ../ffmpeg/libavutil/old_pix_fmts.h ../ffmpeg/libavutil/avutil.h \
- ../ffmpeg/libavutil/cpu.h ../ffmpeg/libavutil/channel_layout.h \
- ../ffmpeg/libavutil/dict.h ../ffmpeg/libavutil/log.h \
- ../ffmpeg/libavutil/pixfmt.h ../ffmpeg/libavutil/rational.h \
- ../ffmpeg/libavcodec/version.h ../ffmpeg/libavcodec/old_codec_ids.h \
- ../ffmpeg/libavutil/common.h ../ffmpeg/libavutil/opt.h \
- ../ffmpeg/libavutil/dict.h ../ffmpeg/libavutil/samplefmt.h \
- ../ffmpeg/libavutil/imgutils.h ../ffmpeg/libavutil/pixdesc.h \
- ../ffmpeg/libavutil/mathematics.h
diff --git a/rotord/av/avCodec.h b/rotord/av/avCodec.h
new file mode 100644
index 0000000..7e1815a
--- /dev/null
+++ b/rotord/av/avCodec.h
@@ -0,0 +1,35 @@
+// libav includes
+// from /usr/include
+
+extern "C" {
+	#ifndef __STDC_CONSTANT_MACROS
+	#  define __STDC_CONSTANT_MACROS
+	#endif
+	
+	#ifndef UINT64_C
+	#define UINT64_C(c) (c ## ULL)
+	#endif
+
+	#include <math.h>
+	
+	#include "libavcodec/avcodec.h"
+
+	#include "libavutil/opt.h"
+	#include "libavutil/channel_layout.h"
+	#include "libavutil/common.h"
+	#include "libavutil/imgutils.h"
+	#include "libavutil/mathematics.h"
+	#include "libavutil/samplefmt.h"
+}
+
+namespace avCodec {
+	static int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt);
+	static int select_sample_rate(AVCodec *codec);
+	static int select_channel_layout(AVCodec *codec);
+	static void audio_encode_example(const char *filename);
+	static void audio_decode_example(const char *outfilename, const char *filename);
+	static void video_encode_example(const char *filename, int codec_id);
+	static void pgm_save(unsigned char *buf, int wrap, int xsize, int ysize,char *filename);
+	static int decode_write_frame(const char *outfilename, AVCodecContext *avctx,AVFrame *frame, int *frame_count, AVPacket *pkt, int last);
+	static void video_decode_example(const char *outfilename, const char *filename);
+}
+\ No newline at end of file