[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55697] trunk/blender/intern/ffmpeg/ ffmpeg_compat.h: Hopefully compilation with FFmpeg 0.10 works fine now.

[Sergey Sharybin]

Revision: 55697
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55697
Author:   nazgul
Date:     2013-04-01 10:53:29 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
Hopefully compilation with FFmpeg 0.10 works fine now.

Modified Paths:
--------------
    trunk/blender/intern/ffmpeg/ffmpeg_compat.h

Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-04-01 10:26:16 UTC (rev 55696)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h	2013-04-01 10:53:29 UTC (rev 55697)
@@ -110,6 +110,16 @@
 #define AV_OPT_TYPE_FLOAT   FF_OPT_TYPE_FLOAT
 #endif
 
+#if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 54))
+static inline
+enum AVSampleFormat av_get_packed_sample_fmt(enum AVSampleFormat sample_fmt)
+{
+    if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB)
+        return AV_SAMPLE_FMT_NONE;
+    return sample_fmt;
+}
+#endif
+
 #if ((LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24) && (LIBAVFORMAT_VERSION_MICRO < 2)))
 #define avformat_close_input(x) av_close_input_file(*(x))
 #endif