[SCM] harvid/master: Imported Upstream version 0.7.3

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 72a4a80a566d4d65710dede3d7d01b269861c0ff
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 28 00:47:57 2013 +0100

    Imported Upstream version 0.7.3

diff --git a/ChangeLog b/ChangeLog
index 5b2e02f..c0aa349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-10 (0.7.3) Robin Gareus <robin at gareus.org>
+* update ffmpeg compatibility wrapper
+* fix CSV file info (no newline)
+* fix fileindex' file-ext filter
+
 2013-04-16 (0.7.2) Robin Gareus <robin at gareus.org>
 * fix aspect ratio calculation
 * update website & upload script
diff --git a/doc/harvid.1 b/doc/harvid.1
index a7d6e06..a3adc35 100644
--- a/doc/harvid.1
+++ b/doc/harvid.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH HARVID "1" "April 2013" "harvid v0.7.2" "User Commands"
+.TH HARVID "1" "June 2013" "harvid v0.7.3" "User Commands"
 .SH NAME
 harvid \- video server
 .SH SYNOPSIS
diff --git a/libharvid/ffcompat.h b/libharvid/ffcompat.h
index 1265907..9b682f2 100644
--- a/libharvid/ffcompat.h
+++ b/libharvid/ffcompat.h
@@ -62,30 +62,31 @@ avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec)
 	avcodec_get_context_defaults(s);
 	return 0;
 }
+#endif
 
-#endif /* < 53.5.0 */
-
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 5, 6)
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 123, 0)
 static inline int
 avcodec_open2(AVCodecContext *avctx, AVCodec *codec, void **options __attribute__((unused)))
 {
 	return avcodec_open(avctx, codec);
 }
-#endif /* <= 53.5.6 */
+#endif
 
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 5, 0)
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 111, 0)
 static inline int
 avformat_find_stream_info(AVFormatContext *ic, void **options)
 {
 	return av_find_stream_info(ic);
 }
+#endif
 
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 5, 0)
 static inline void
 avformat_close_input(AVFormatContext **s)
 {
 	av_close_input_file(*s);
 }
 
-#endif /* < 53.5.0 */
+#endif
 
 #endif /* FFCOMPAT_H */
diff --git a/src/fileindex.c b/src/fileindex.c
index 1fa620f..adc6962 100644
--- a/src/fileindex.c
+++ b/src/fileindex.c
@@ -218,14 +218,14 @@ static void parse_direntry (const char *root, const char *burl, const char *path
                 || !strcmp(&name[l4], ".flv")
                 || !strcmp(&name[l4], ".m4v")
         )) ||
-      (l5 > 0 && ( !strcmp(&name[l4], ".h264")
-                || !strcmp(&name[l4], ".webm")
+      (l5 > 0 && ( !strcmp(&name[l5], ".h264")
+                || !strcmp(&name[l5], ".webm")
         )) ||
-      (l6 > 0 && ( !strcmp(&name[l4], ".dirac")
+      (l6 > 0 && ( !strcmp(&name[l6], ".dirac")
         )) ||
-      (l9 > 0 && ( !strcmp(&name[l4], ".matroska")
+      (l9 > 0 && ( !strcmp(&name[l9], ".matroska")
         )) ||
-      (l3 > 0 && ( !strcmp(&name[l4], ".dv")
+      (l3 > 0 && ( !strcmp(&name[l3], ".dv")
         ))
      ) {
     char *url = strdup(burl);
diff --git a/src/harvid.c b/src/harvid.c
index c952ec0..9a47843 100644
--- a/src/harvid.c
+++ b/src/harvid.c
@@ -504,7 +504,7 @@ static char *file_info_csv (CONN *c, ics_request_args *a, VInfo *ji) {
   off+=snprintf(im+off, NFOSIZ-off, "1"); // FORMAT VERSION
   off+=snprintf(im+off, NFOSIZ-off, ",%i", ji->movie_width);
   off+=snprintf(im+off, NFOSIZ-off, ",%i", ji->movie_height);
-  off+=snprintf(im+off, NFOSIZ-off, ",%f\n", ji->movie_aspect);
+  off+=snprintf(im+off, NFOSIZ-off, ",%f", ji->movie_aspect);
   off+=snprintf(im+off, NFOSIZ-off, ",%.3f", timecode_rate_to_double(&ji->framerate));
   off+=snprintf(im+off, NFOSIZ-off, ",%"PRId64, ji->frames);
   off+=snprintf(im+off, NFOSIZ-off, "\n");

-- 
harvid packaging