diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-04-13 06:24:23 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-04-13 06:24:23 +0000 |
| commit | 4be03d2e4f640b91d918d08ffb7f863b70ee40b9 (patch) | |
| tree | 21c5bccbf57857d9e7bb3c896d3d212b33fcf5f4 /pjmedia/src/test | |
| parent | afc721810fb9b6a2bc9f9af34132ffc96078669a (diff) | |
Re #1446 (misc): Modified ffmpeg_codecs to ffmpeg_vid_codecs
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4049 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/test')
| -rw-r--r-- | pjmedia/src/test/vid_codec_test.c | 10 | ||||
| -rw-r--r-- | pjmedia/src/test/vid_dev_test.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/test/vid_port_test.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pjmedia/src/test/vid_codec_test.c b/pjmedia/src/test/vid_codec_test.c index 5d1af672..a4a5baaa 100644 --- a/pjmedia/src/test/vid_codec_test.c +++ b/pjmedia/src/test/vid_codec_test.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "test.h" -#include <pjmedia-codec/ffmpeg_codecs.h> +#include <pjmedia-codec/ffmpeg_vid_codecs.h> #include <pjmedia-videodev/videodev.h> #include <pjmedia/vid_codec.h> #include <pjmedia/port.h> @@ -453,8 +453,8 @@ int vid_codec_test(void) if (status != PJ_SUCCESS) return -10; -#if PJMEDIA_HAS_FFMPEG_CODEC - status = pjmedia_codec_ffmpeg_init(NULL, mem); +#if PJMEDIA_HAS_FFMPEG_VID_CODEC + status = pjmedia_codec_ffmpeg_vid_init(NULL, mem); if (status != PJ_SUCCESS) return -20; #endif @@ -472,8 +472,8 @@ int vid_codec_test(void) goto on_return; on_return: -#if PJMEDIA_HAS_FFMPEG_CODEC - pjmedia_codec_ffmpeg_deinit(); +#if PJMEDIA_HAS_FFMPEG_VID_CODEC + pjmedia_codec_ffmpeg_vid_deinit(); #endif pjmedia_vid_dev_subsys_shutdown(); pj_pool_release(pool); diff --git a/pjmedia/src/test/vid_dev_test.c b/pjmedia/src/test/vid_dev_test.c index 8f78094a..35206fb7 100644 --- a/pjmedia/src/test/vid_dev_test.c +++ b/pjmedia/src/test/vid_dev_test.c @@ -19,7 +19,7 @@ */ #include "test.h" #include <pjmedia-audiodev/audiodev.h> -#include <pjmedia-codec/ffmpeg_codecs.h> +#include <pjmedia-codec/ffmpeg_vid_codecs.h> #include <pjmedia/vid_codec.h> #include <pjmedia_videodev.h> diff --git a/pjmedia/src/test/vid_port_test.c b/pjmedia/src/test/vid_port_test.c index 82f0c1bf..634f612f 100644 --- a/pjmedia/src/test/vid_port_test.c +++ b/pjmedia/src/test/vid_port_test.c @@ -19,7 +19,7 @@ */ #include "test.h" #include <pjmedia-audiodev/audiodev.h> -#include <pjmedia-codec/ffmpeg_codecs.h> +#include <pjmedia-codec/ffmpeg_vid_codecs.h> #include <pjmedia/vid_codec.h> #include <pjmedia_videodev.h> |