[MPlayer-dev-eng] [MPlayer-users] [PATCH] Re: Remove avi header info? (fwd)

[D Richard Felker III]

Should we commit this? (See discussion on -users) IMO the patch isn't
quite correct as-is but is very much a desirable feature.

Rich

----- Forwarded message from rgselk <rgselknospam at yahoo.com> -----

Date: Tue, 7 Oct 2003 00:43:33 -0700 (PDT)
From: rgselk <rgselknospam at yahoo.com>
Subject: [MPlayer-users] [PATCH] Re: Remove avi header info?
To: mplayer-users <mplayer-users at mplayerhq.hu>
Precedence: list
Reply-To: "MPlayer user's list." <mplayer-users at mplayerhq.hu>

[Automatic answer: RTFM (read DOCS, FAQ), also read DOCS/bugreports.html]

Please find attached a patch I made some time ago. It adds the option
'-info software' to mencoder. It should still work I think.


__________________________________
Do you Yahoo!?
The New Yahoo! Shopping - with improved product search
http://shopping.yahoo.com
Content-Description: mencoder.info.txt
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.70
diff -u -w -r1.70 cfg-mencoder.h
--- cfg-mencoder.h	19 Aug 2003 15:10:10 -0000	1.70
+++ cfg-mencoder.h	7 Oct 2003 07:28:09 -0000
@@ -119,6 +119,7 @@
 };
 
 m_option_t info_conf[]={
+	{"software", &info_software, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"name", &info_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"artist", &info_artist, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"genre", &info_genre, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -127,6 +128,7 @@
 	{"srcform", &info_sourceform, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"comment", &info_comment, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"help", "\nAvailable INFO fields:\n"
+	"   software  - software used for encoding (MEncoder)\n"
 	"   name      - title of the subject of the file\n"
 	"   artist    - artist or author of the original subject of the file\n"
 	"   genre     - original work category\n"
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.218
diff -u -w -r1.218 mencoder.c
--- mencoder.c	13 Aug 2003 16:29:00 -0000	1.218
+++ mencoder.c	7 Oct 2003 07:28:09 -0000
@@ -168,6 +168,7 @@
 int auto_expand=1;
 
 // infos are empty by default
+char *info_software=NULL;
 char *info_name=NULL;
 char *info_artist=NULL;
 char *info_genre=NULL;
Index: libmpdemux/muxer_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v
retrieving revision 1.15
diff -u -w -r1.15 muxer_avi.c
--- libmpdemux/muxer_avi.c	19 Jan 2003 00:33:11 -0000	1.15
+++ libmpdemux/muxer_avi.c	7 Oct 2003 07:28:09 -0000
@@ -20,6 +20,7 @@
 #include "muxer.h"
 #include "aviheader.h"
 
+extern char *info_software;
 extern char *info_name;
 extern char *info_artist;
 extern char *info_genre;
@@ -224,10 +225,12 @@
 
 // ============= INFO ===============
 // always include software info
-info[0].id=mmioFOURCC('I','S','F','T'); // Software:
-info[0].text="MEncoder " VERSION;
 // include any optional strings
-i=1;
+i=0;
+if(info_software==NULL||info_software[0]){
+  info[i].id=mmioFOURCC('I','S','F','T'); // Software:
+  info[i++].text=(info_software!=NULL)?info_software:"MEncoder";
+}
 if(info_name!=NULL){
   info[i].id=mmioFOURCC('I','N','A','M'); // Name:
   info[i++].text=info_name;

_______________________________________________
RTFM!!!  http://www.MPlayerHQ.hu/DOCS
Search:  http://www.MPlayerHQ.hu/cgi-bin/htsearch
http://mplayerhq.hu/mailman/listinfo/mplayer-users


----- End forwarded message -----