[FFmpeg-cvslog] avformat/md5enc: add format_version, to allow selecting which version to use

Michael Niedermayer git at videolan.org
Wed Jul 16 22:55:43 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 16 22:34:56 2014 +0200| [7da2592f5677460118c10aa9accd89958c7304d8] | committer: Michael Niedermayer

avformat/md5enc: add format_version, to allow selecting which version to use

Currently there is just version 1
Fixes remaining part of Ticket2280

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7da2592f5677460118c10aa9accd89958c7304d8
---

 libavformat/md5enc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c
index 8b14fba..8e87f09 100644
--- a/libavformat/md5enc.c
+++ b/libavformat/md5enc.c
@@ -30,6 +30,7 @@ struct MD5Context {
     const AVClass *avclass;
     struct AVHashContext *hash;
     char *hash_name;
+    int format_version;
 };
 
 static void md5_finish(struct AVFormatContext *s, char *buf)
@@ -55,6 +56,7 @@ static void md5_finish(struct AVFormatContext *s, char *buf)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption hash_options[] = {
     { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str = "md5"}, 0, 0, ENC },
+    { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 1}, 1, 1, ENC },
     { NULL },
 };
 
@@ -118,7 +120,7 @@ static int framemd5_write_header(struct AVFormatContext *s)
     if (res < 0)
         return res;
     avio_printf(s->pb, "#format: frame checksums\n");
-    avio_printf(s->pb, "#version: 1\n");
+    avio_printf(s->pb, "#version: %d\n", c->format_version);
     avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash));
     ff_framehash_write_header(s);
     avio_printf(s->pb, "#stream#, dts,        pts, duration,     size, hash\n");



More information about the ffmpeg-cvslog mailing list