summaryrefslogtreecommitdiff
path: root/ffmpeg/version.h
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-11-02 16:13:41 +0000
committerComment <tim@gray.(none)>2013-11-02 16:13:41 +0000
commit510a5218d5e981db3dde9ed31ddc6f732ed6a22a (patch)
treeb9d09c4dbdefed1ec693e0492841cde426ef6643 /ffmpeg/version.h
parent8864f5da9649c176e472a7fb8913dd8114deec54 (diff)
parenteaccb1437465c6aa49e1d5511876852543e3b0fa (diff)
merge branch
Diffstat (limited to 'ffmpeg/version.h')
-rw-r--r--ffmpeg/version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg/version.h b/ffmpeg/version.h
index 17e4c89..938d02c 100644
--- a/ffmpeg/version.h
+++ b/ffmpeg/version.h
@@ -1 +1 @@
-#define FFMPEG_VERSION "git-2013-10-01-ff7a134"
+#define FFMPEG_VERSION "git-2013-10-31-e67e0a6"