[FFmpeg-cvslog] avformat/framehash: add software version to framecrc/md5

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 20 22:23:08 2013 +0200| [3ce7c62e1b47af998b7854494978d8bf79329ec2] | committer: Michael Niedermayer

avformat/framehash: add software version to framecrc/md5

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

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

 libavformat/framehash.c |    3 +++
 tests/fate-run.sh       |    4 ++--
 tests/fate/vqf.mak      |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavformat/framehash.c b/libavformat/framehash.c
index 85caeb3..f97f59b 100644
--- a/libavformat/framehash.c
+++ b/libavformat/framehash.c
@@ -23,6 +23,9 @@
 int ff_framehash_write_header(AVFormatContext *s)
 {
     int i;
+
+    if (s->nb_streams && !(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
+        avio_printf(s->pb, "#software: %s\n", LIBAVFORMAT_IDENT);
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
         avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 52ddc22..48e9dd0 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -90,11 +90,11 @@ ffmpeg(){
 }
 
 framecrc(){
-    ffmpeg "$@" -f framecrc -
+    ffmpeg "$@" -flags +bitexact -f framecrc -
 }
 
 framemd5(){
-    ffmpeg "$@" -f framemd5 -
+    ffmpeg "$@" -flags +bitexact -f framemd5 -
 }
 
 crc(){
diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
index 8b50d7a..ac18ebd 100644
--- a/tests/fate/vqf.mak
+++ b/tests/fate/vqf.mak
@@ -4,7 +4,7 @@ fate-twinvq: CMP = oneoff
 fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
 
 FATE_VQF-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux
-fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
+fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -flags bitexact -f framecrc
 
 FATE_VQF += $(FATE_VQF-yes)