Changeset 4049 for pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

Timestamp:

Apr 13, 2012 6:24:23 AM (12 years ago)

Author:

ming

Message:

Re #1446 (misc): Modified ffmpeg_codecs to ffmpeg_vid_codecs

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

@@ -17 +17 @@
  * 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>
@@ -32 +32 @@
 
 /*
- * 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 || \
@@ -561 +562 @@
  * 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;
@@ -832 +833 @@
  * 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;
@@ -1774 +1775 @@
 #endif
 
-#endif  /* PJMEDIA_HAS_FFMPEG_CODEC */
-
+#endif  /* PJMEDIA_HAS_FFMPEG_VID_CODEC */
+