[FFmpeg-devel] [PATCH] avformat/matroskaenc: add allow_raw_vfw and disable it by default

[Michael Niedermayer]

On Sat, Feb 14, 2015 at 02:12:15PM -0300, James Almer wrote:
> On 14/02/15 12:20 PM, Michael Niedermayer wrote:
> > Based on complaint by wm4
> > 
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  libavformat/matroskaenc.c |   14 ++++++++++++--
> >  1 file changed, 12 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
> > index eb6e859..fc6371b 100644
> > --- a/libavformat/matroskaenc.c
> > +++ b/libavformat/matroskaenc.c
> > @@ -123,6 +123,8 @@ typedef struct MatroskaMuxContext {
> >  
> >      uint32_t chapter_id_offset;
> >      int wrote_chapters;
> > +
> > +    int allow_raw_vfw;
> >  } MatroskaMuxContext;
> >  
> >  
> > @@ -879,8 +881,15 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
> >                  break;
> >              }
> >          }
> > -        if (codec->codec_id == AV_CODEC_ID_RAWVIDEO && !codec->codec_tag)
> > -            native_id = 0;
> > +        if (codec->codec_id == AV_CODEC_ID_RAWVIDEO && !codec->codec_tag) {
> > +            if (mkv->allow_raw_vfw) {
> > +                native_id = 0;
> > +            } else {
> > +                av_log(s, AV_LOG_ERROR, "Raw RGB is not supported nativly in Matroska, you can use AVI or NUT or\n"
> 
> Natively

changed

applied

thanks to all

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150215/299c6690/attachment.asc>