diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 2fd034d164..506f62666b 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -190,6 +190,12 @@ Set the copyright.
 @item -comment string
 Set the comment.
 
+@item -track number
+Set the track.
+
+@item -year number
+Set the year.
+
 @item -target type
 Specify target file type ("vcd", "svcd", "dvd", "dv", "pal-vcd",
 "ntsc-svcd", ... ). All the format options (bitrate, codecs,
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cb793435fb..6348ac98df 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -469,6 +469,8 @@ static const AVOption options[]={
 {"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D, "fflags"},
 {"ignidx", "ignore index", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNIDX, INT_MIN, INT_MAX, D, "fflags"},
 {"genpts", "generate pts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_GENPTS, INT_MIN, INT_MAX, D, "fflags"},
+{"track", " set the track number", OFFSET(track), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, E},
+{"year", "set the year", OFFSET(year), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, E},
 {NULL},
 };