Imported Debian version 2.5.2~trusty

[deb_ffmpeg.git] / ffmpeg / libavdevice / avdevice.c

diff --git a/ffmpeg/libavdevice/avdevice.c b/ffmpeg/libavdevice/avdevice.c
index 6a75bd79d7fc08746ae28e944acf5fe95bf041f2..c68126faa3af31fd6642759a2b9585c56ad94270 100644 (file)
--- a/ffmpeg/libavdevice/avdevice.c
+++ b/ffmpeg/libavdevice/avdevice.c
@@ -23,6 +23,9 @@
 #include "avdevice.h"
 #include "config.h"
 
+#include "libavutil/ffversion.h"
+const char av_device_ffversion[] = "FFmpeg version " FFMPEG_VERSION;
+
 #define E AV_OPT_FLAG_ENCODING_PARAM
 #define D AV_OPT_FLAG_DECODING_PARAM
 #define A AV_OPT_FLAG_AUDIO_PARAM
@@ -219,11 +222,11 @@ void avdevice_free_list_devices(AVDeviceInfoList **device_list)
     for (i = 0; i < list->nb_devices; i++) {
         dev = list->devices[i];
         if (dev) {
-            av_free(dev->device_name);
-            av_free(dev->device_description);
+            av_freep(&dev->device_name);
+            av_freep(&dev->device_description);
             av_free(dev);
         }
     }
-    av_free(list->devices);
+    av_freep(&list->devices);
     av_freep(device_list);
 }