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

4 files changed, 16 insertions, 15 deletions

diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
index 4200369a..960267db 100644
--- a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjmedia-codec/ffmpeg_codecs.h>
+#include <pjmedia-codec/ffmpeg_vid_codecs.h>
 #include <pjmedia-codec/h263_packetizer.h>
 #include <pjmedia-codec/h264_packetizer.h>
 #include <pjmedia/errno.h>
@@ -31,13 +31,14 @@
 
 
 /*
- * Only build this file if PJMEDIA_HAS_FFMPEG_CODEC != 0 and 
+ * Only build this file if PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 and 
  * PJMEDIA_HAS_VIDEO != 0
  */
-#if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0 && \
+#if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && \
+            PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 && \
     defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
-#define THIS_FILE   "ffmpeg_codecs.c"
+#define THIS_FILE   "ffmpeg_vid_codecs.c"
 
 #define LIBAVCODEC_VER_AT_LEAST(major,minor)  (LIBAVCODEC_VERSION_MAJOR > major || \
      					       (LIBAVCODEC_VERSION_MAJOR == major && \
@@ -560,8 +561,8 @@ static int find_codec_idx_by_fmt_id(pjmedia_format_id fmt_id)
 /*
  * Initialize and register FFMPEG codec factory to pjmedia endpoint.
  */
-PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_init(pjmedia_vid_codec_mgr *mgr,
-                                              pj_pool_factory *pf)
+PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
+                                                  pj_pool_factory *pf)
 {
     pj_pool_t *pool;
     AVCodec *c;
@@ -831,7 +832,7 @@ on_error:
 /*
  * Unregister FFMPEG codecs factory from pjmedia endpoint.
  */
-PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_deinit(void)
+PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_deinit(void)
 {
     pj_status_t status = PJ_SUCCESS;
 
@@ -1773,5 +1774,5 @@ static pj_status_t ffmpeg_codec_decode( pjmedia_vid_codec *codec,
 #   pragma comment( lib, "avcodec.lib")
 #endif
 
-#endif	/* PJMEDIA_HAS_FFMPEG_CODEC */
+#endif	/* PJMEDIA_HAS_FFMPEG_VID_CODEC */
 
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>