Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavdevice / v4l2-common.c

diff --git a/ffmpeg/libavdevice/v4l2-common.c b/ffmpeg/libavdevice/v4l2-common.c
index c4c75d7b6dd5f1724c540cf601ba3a800e912933..196c09b7fc85a65fe76231a01ffe523c116d0eac 100644 (file)
--- a/ffmpeg/libavdevice/v4l2-common.c
+++ b/ffmpeg/libavdevice/v4l2-common.c
@@ -18,7 +18,7 @@
 
 #include "v4l2-common.h"
 
-const struct fmt_map avpriv_fmt_conversion_table[] = {
+const struct fmt_map ff_fmt_conversion_table[] = {
     //ff_fmt              codec_id              v4l2_fmt
     { AV_PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YUV420  },
     { AV_PIX_FMT_YUV420P, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_YVU420  },
@@ -46,6 +46,9 @@ const struct fmt_map avpriv_fmt_conversion_table[] = {
 #ifdef V4L2_PIX_FMT_H264
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_H264,     V4L2_PIX_FMT_H264    },
 #endif
+#ifdef V4L2_PIX_FMT_MPEG4
+    { AV_PIX_FMT_NONE,    AV_CODEC_ID_MPEG4,    V4L2_PIX_FMT_MPEG4   },
+#endif
 #ifdef V4L2_PIX_FMT_CPIA1
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_CPIA,     V4L2_PIX_FMT_CPIA1   },
 #endif
@@ -58,43 +61,43 @@ const struct fmt_map avpriv_fmt_conversion_table[] = {
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_NONE,     0                    },
 };
 
-uint32_t avpriv_fmt_ff2v4l(enum AVPixelFormat pix_fmt, enum AVCodecID codec_id)
+uint32_t ff_fmt_ff2v4l(enum AVPixelFormat pix_fmt, enum AVCodecID codec_id)
 {
     int i;
 
-    for (i = 0; avpriv_fmt_conversion_table[i].codec_id != AV_CODEC_ID_NONE; i++) {
+    for (i = 0; ff_fmt_conversion_table[i].codec_id != AV_CODEC_ID_NONE; i++) {
         if ((codec_id == AV_CODEC_ID_NONE ||
-             avpriv_fmt_conversion_table[i].codec_id == codec_id) &&
+             ff_fmt_conversion_table[i].codec_id == codec_id) &&
             (pix_fmt == AV_PIX_FMT_NONE ||
-             avpriv_fmt_conversion_table[i].ff_fmt == pix_fmt)) {
-            return avpriv_fmt_conversion_table[i].v4l2_fmt;
+             ff_fmt_conversion_table[i].ff_fmt == pix_fmt)) {
+            return ff_fmt_conversion_table[i].v4l2_fmt;
         }
     }
 
     return 0;
 }
 
-enum AVPixelFormat avpriv_fmt_v4l2ff(uint32_t v4l2_fmt, enum AVCodecID codec_id)
+enum AVPixelFormat ff_fmt_v4l2ff(uint32_t v4l2_fmt, enum AVCodecID codec_id)
 {
     int i;
 
-    for (i = 0; avpriv_fmt_conversion_table[i].codec_id != AV_CODEC_ID_NONE; i++) {
-        if (avpriv_fmt_conversion_table[i].v4l2_fmt == v4l2_fmt &&
-            avpriv_fmt_conversion_table[i].codec_id == codec_id) {
-            return avpriv_fmt_conversion_table[i].ff_fmt;
+    for (i = 0; ff_fmt_conversion_table[i].codec_id != AV_CODEC_ID_NONE; i++) {
+        if (ff_fmt_conversion_table[i].v4l2_fmt == v4l2_fmt &&
+            ff_fmt_conversion_table[i].codec_id == codec_id) {
+            return ff_fmt_conversion_table[i].ff_fmt;
         }
     }
 
     return AV_PIX_FMT_NONE;
 }
 
-enum AVCodecID avpriv_fmt_v4l2codec(uint32_t v4l2_fmt)
+enum AVCodecID ff_fmt_v4l2codec(uint32_t v4l2_fmt)
 {
     int i;
 
-    for (i = 0; avpriv_fmt_conversion_table[i].codec_id != AV_CODEC_ID_NONE; i++) {
-        if (avpriv_fmt_conversion_table[i].v4l2_fmt == v4l2_fmt) {
-            return avpriv_fmt_conversion_table[i].codec_id;
+    for (i = 0; ff_fmt_conversion_table[i].codec_id != AV_CODEC_ID_NONE; i++) {
+        if (ff_fmt_conversion_table[i].v4l2_fmt == v4l2_fmt) {
+            return ff_fmt_conversion_table[i].codec_id;
         }
     }