From 2f0be2fedf7950107fb87407d2fe8ff8f05014bc Mon Sep 17 00:00:00 2001
From: martii <m4rtii@gmx.de>
Date: Sun, 24 Feb 2013 09:52:16 +0100
Subject: [PATCH] pic2m2v: remove verbosity level from ffmpeg due to
 incompatibility with the 0.8 branch

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a8668dc453de0c08d54c8f2a30f966a758ec4d83
Author: martii <m4rtii@gmx.de>
Date: 2013-02-24 (Sun, 24 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 tools/pic2m2v.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/pic2m2v.c b/tools/pic2m2v.c
index d99ddc1..49b8c82 100644
--- a/tools/pic2m2v.c
+++ b/tools/pic2m2v.c
@@ -72,8 +72,13 @@ int main(int argc, char **argv)
 			u.modtime = st2.st_mtime;
 			printf("converting %s -> %s\n", fname, destname);
 			/* it does not exist or has a different date, so call ffmpeg... */
+#ifdef MARTII
+			sprintf(cmd, "ffmpeg -y -f mjpeg -i '%s' -s %s '%s' </dev/null",
+							fname, TARGETRES, destname);
+#else
 			sprintf(cmd, "ffmpeg -v 31 -y -f mjpeg -i '%s' -s %s '%s' </dev/null",
 							fname, TARGETRES, destname);
+#endif
 			system(cmd); /* TODO: use libavcodec to directly convert it */
 			utime(destname, &u);
 		}