On Tue, Nov 10, 2015 at 01:01:44PM +0000, tim nicholson wrote:
> On 10/11/15 12:28, Michael Niedermayer wrote:
> > From: Michael Niedermayer <mich...@niedermayer.cc>
> >
> > Also support disabling them as they seem to cause problems to some
> > Users. They are also not allowed in IRT D-10 thus the default for
> > mxf_d10 is not to write them
> >
> > This also decreases the filesize when no user comment are stored
> >
> > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> > ---
> > doc/muxers.texi | 15 ++++++++++
> > libavformat/mxfenc.c | 46 +++++++++++++++++++++--------
> > tests/ref/lavf/mxf | 12 ++++----
> > tests/ref/lavf/mxf_d10 | 2 +-
> > tests/ref/lavf/mxf_opatom | 2 +-
> > tests/ref/lavf/mxf_opatom_audio | 4 +--
> > tests/ref/seek/lavf-mxf | 44 +++++++++++++--------------
> > tests/ref/seek/lavf-mxf_opatom_audio | 54
> > +++++++++++++++++-----------------
> > 8 files changed, 107 insertions(+), 72 deletions(-)
> >
> > [..]
>
> > @@ -2038,6 +2051,9 @@ static int mxf_write_header(AVFormatContext *s)
> > return -1;
> > }
> >
> > + if (!av_dict_get(s->metadata, "comment_", NULL, AV_DICT_IGNORE_SUFFIX))
> > + mxf->store_user_comments = 0;
> > +
> > for (i = 0; i < s->nb_streams; i++) {
> > AVStream *st = s->streams[i];
> > MXFStreamContext *sc = av_mallocz(sizeof(*sc));
> > @@ -2650,12 +2666,14 @@ static int mxf_interleave(AVFormatContext *s,
> > AVPacket *out, AVPacket *pkt, int
> > { "smpte349m", "SMPTE 349M (1485 Mbps mappings)",\
> > 0, AV_OPT_TYPE_CONST, {.i64 = 6}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM,
> > "signal_standard"},\
> > { "smpte428", "SMPTE 428-1 DCDM",\
> > - 0, AV_OPT_TYPE_CONST, {.i64 = 7}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM,
> > "signal_standard"},
> > + 0, AV_OPT_TYPE_CONST, {.i64 = 7}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM,
> > "signal_standard"},\
>
> Stray \ from previous patch attempt?yes, fixed applied thanks to all [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The greatest way to live with honor in this world is to be what we pretend to be. -- Socrates
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
