diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-23 12:34:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-23 12:34:36 +0000 |
| commit | d302d45c2102b8fc97bbd256b43fa74119cc9332 (patch) | |
| tree | c48594c72c7ee2f7ab3f439198a61028d595d7b7 | |
| parent | 5a999debb53087de8188603ea9b9d928b2293978 (diff) | |
Remove libavformat-specific bit from FileGroup.
| -rw-r--r-- | src/lib/file_group.cc | 5 | ||||
| -rw-r--r-- | src/lib/wscript | 1 | ||||
| -rw-r--r-- | test/file_group_test.cc | 6 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc index 5f9531f4c..d364a395d 100644 --- a/src/lib/file_group.cc +++ b/src/lib/file_group.cc @@ -18,9 +18,6 @@ */ #include <cstdio> -extern "C" { -#include <libavformat/avio.h> -} #include <sndfile.h> #include "file_group.h" #include "exceptions.h" @@ -96,8 +93,6 @@ FileGroup::seek (int64_t pos, int whence) const case SEEK_END: full_pos = len - pos; break; - case AVSEEK_SIZE: - return len; } /* Seek to full_pos */ diff --git a/src/lib/wscript b/src/lib/wscript index 1e88e6e62..ebd316a0c 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -22,6 +22,7 @@ sources = """ encoder.cc examine_content_job.cc exceptions.cc + file_group.cc filter_graph.cc ffmpeg.cc ffmpeg_content.cc diff --git a/test/file_group_test.cc b/test/file_group_test.cc index 025d6be02..6f66d8804 100644 --- a/test/file_group_test.cc +++ b/test/file_group_test.cc @@ -21,9 +21,6 @@ #include <cstdio> #include <boost/test/unit_test.hpp> #include <boost/filesystem.hpp> -extern "C" { -#include <libavformat/avio.h> -} #include "lib/file_group.h" using std::vector; @@ -107,7 +104,4 @@ BOOST_AUTO_TEST_CASE (file_group_test) BOOST_CHECK_EQUAL (fg.seek (1077, SEEK_END), total_length - 1077); BOOST_CHECK_EQUAL (fg.read (test, 256), 256); BOOST_CHECK_EQUAL (memcmp (data + total_length - 1077, test, 256), 0); - - /* AVSEEK_SIZE */ - BOOST_CHECK_EQUAL (fg.seek (-1, AVSEEK_SIZE), total_length); } |