]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jan 2012 00:07:30 +0000 (01:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jan 2012 00:29:48 +0000 (01:29 +0100)
* qatar/master: (21 commits)
  utils: Check for extradata size overflows.
  ARM: rv34: fix asm syntax in dc transform functions
  avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
  rv34: fix and optimise frame dependency checking
  rv34: NEON optimised dc only inverse transform
  avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
  ffmenc: remove references to deprecated AVFormatContext.timestamp.
  lavf: undeprecate read_seek().
  avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
  lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
  lavc: ifdef out parse_only AVOption
  nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
  mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
  riff: remove references to sonic codec ids
  indeo4: add some missing static and const qualifiers
  rv34: DC-only inverse transform
  avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
  lavfi: move version macros to a new installed header version.h
  vsrc_buffer: release the buffer on uninit.
  rgb2rgb: rgb12tobgr12()
  ...

Conflicts:
avconv.c
doc/APIchanges
ffprobe.c
libavfilter/Makefile
libavfilter/avfilter.h
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
24 files changed:
1  2 
avconv.c
doc/APIchanges
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/aacdec.c
libavcodec/internal.h
libavcodec/mpegvideo_enc.c
libavcodec/options.c
libavcodec/rv34.c
libavcodec/rv34data.h
libavcodec/utils.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavfilter/avfilter.h
libavfilter/version.h
libavfilter/vsrc_buffer.c
libavformat/avformat.h
libavformat/avio.h
libavformat/ffmenc.c
libavformat/riff.c
libavformat/utils.c
libavformat/version.h
libswscale/rgb2rgb.c

diff --cc avconv.c
index 5f0422cc5dda1409d2e751d9450e984b370d0c0e,817c0cf928f5a00671b159a4a6d20b00af32c055..0c6ef6d82df9000b9ed6e31ff7c538a238fdedf2
+++ b/avconv.c
@@@ -1312,47 -1262,35 +1312,48 @@@ static void do_video_resample(OutputStr
                                AVFrame **out_picture)
  {
      int resample_changed = 0;
 +    AVCodecContext *dec = ist->st->codec;
 +    AVCodecContext *enc = ost->st->codec;
      *out_picture = in_picture;
  
-     resample_changed = ost->resample_width   != dec->width  ||
-                        ost->resample_height  != dec->height ||
-                        ost->resample_pix_fmt != dec->pix_fmt;
+     resample_changed = ost->resample_width   != in_picture->width  ||
+                        ost->resample_height  != in_picture->height ||
+                        ost->resample_pix_fmt != in_picture->format;
  
      if (resample_changed) {
          av_log(NULL, AV_LOG_INFO,
--               "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
++               "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s / frm size:%dx%d fmt:%s\n",
                 ist->file_index, ist->st->index,
                 ost->resample_width, ost->resample_height, av_get_pix_fmt_name(ost->resample_pix_fmt),
-                dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt));
-         ost->resample_width   = dec->width;
-         ost->resample_height  = dec->height;
-         ost->resample_pix_fmt = dec->pix_fmt;
++               dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt),
+                in_picture->width, in_picture->height, av_get_pix_fmt_name(in_picture->format));
 -        if (!ost->video_resample)
 -            ost->video_resample = 1;
++        ost->resample_width   = in_picture->width;
++        ost->resample_height  = in_picture->height;
++        ost->resample_pix_fmt = in_picture->format;
      }
  
 +    ost->video_resample = dec->width   != enc->width  ||
 +                          dec->height  != enc->height ||
 +                          dec->pix_fmt != enc->pix_fmt;
 +
 +
      if (ost->video_resample) {
 -        *out_picture = &ost->pict_tmp;
 -        if (resample_changed) {
 +        *out_picture = &ost->resample_frame;
 +        if (!ost->img_resample_ctx || resample_changed) {
 +            /* initialize the destination picture */
 +            if (!ost->resample_frame.data[0]) {
 +                avcodec_get_frame_defaults(&ost->resample_frame);
 +                if (avpicture_alloc((AVPicture *)&ost->resample_frame, enc->pix_fmt,
 +                                    enc->width, enc->height)) {
 +                    fprintf(stderr, "Cannot allocate temp picture, check pix fmt\n");
 +                    exit_program(1);
 +                }
 +            }
              /* initialize a new scaler context */
              sws_freeContext(ost->img_resample_ctx);
 -            ost->img_resample_ctx = sws_getContext(
 -                ist->st->codec->width,
 -                ist->st->codec->height,
 -                ist->st->codec->pix_fmt,
 -                ost->st->codec->width,
 -                ost->st->codec->height,
 -                ost->st->codec->pix_fmt,
 -                ost->sws_flags, NULL, NULL, NULL);
 +            ost->img_resample_ctx = sws_getContext(dec->width, dec->height, dec->pix_fmt,
 +                                                   enc->width, enc->height, enc->pix_fmt,
 +                                                   ost->sws_flags, NULL, NULL, NULL);
              if (ost->img_resample_ctx == NULL) {
                  av_log(NULL, AV_LOG_FATAL, "Cannot get resampling context\n");
                  exit_program(1);
diff --cc doc/APIchanges
index b146cb00ad785b34de6587d776dddbc0074a8bb9,751566afe211a7415ee3562983433d87301fa6a3..3b3da66eee1f2562998b1074641f94c55b3dc9f8
@@@ -13,26 -13,25 +13,29 @@@ libavutil:   2011-04-1
  
  API changes, most recent first:
  
 -2011-01-03 - b73ec05 - lavu 51.21.0
 -  Add av_popcount64
+ 2012-01-xx - xxxxxxx - lavfi 2.15.0
+   Add a new installed header -- libavfilter/version.h -- with version macros.
 +2011-12-08 - a502939 - lavfi 2.52.0
 +  Add av_buffersink_poll_frame() to buffersink.h.
 +
 +2011-12-08 - xxxxxxx - lavu 51.31.0
 +  Add av_log_format_line.
 +
 +2011-12-03 - xxxxxxx - lavu 51.30.0
 +  Add AVERROR_BUG.
  
 -2011-12-25 - lavfi 2.14.0
 -  e1d9dbf Add a new installed header - buffersrc.h
 -  It contains a new function av_buffersrc_buffer() that allows passing
 -  frames to the 'buffer' filter, but unlike av_vsrc_buffer_add_frame()
 -  it allows for direct rendering.
 -  1c9e340 Add avfilter_copy_frame_props() for copying properties from
 -  AVFrame to AVFilterBufferRef.
 +2011-xx-xx - xxxxxxx - lavu 51.28.1
 +  Add av_get_alt_sample_fmt() to samplefmt.h.
  
 -2011-12-25 - lavc 53.31.0
 -  Add the following new fields to AVFrame:
 -    b58dbb5 sample_aspect_ratio
 -    3a2ddf7 width, height
 -    8a4a5f6 format
 +2011-11-03 - 96949da - lavu 51.23.0
 +  Add av_strcasecmp() and av_strncasecmp() to avstring.h.
 +
 +2011-10-20 - b35e9e1 - lavu 51.22.0
 +  Add av_strtok() to avstring.h.
 +
 +2011-01-03 - b73ec05 - lavu 51.21.0
 +  Add av_popcount64
  
  2011-12-18 - 8400b12 - lavc 53.28.1
    Deprecate AVFrame.age. The field is unused.
diff --cc ffmpeg.c
index 884abdee6c861131aeb581ff14ba3979443d5b19,0ec3b241caffd2652b110992a3f834f3a47fed52..997333ec4afc110242885403c9a2d53c4e7699b7
+++ b/ffmpeg.c
@@@ -1352,89 -1102,22 +1352,90 @@@ static void do_subtitle_out(AVFormatCon
      }
  }
  
 -static int bit_buffer_size= 1024*256;
 -static uint8_t *bit_buffer= NULL;
 +static int bit_buffer_size = 1024 * 256;
 +static uint8_t *bit_buffer = NULL;
  
 -static void do_video_out(AVFormatContext *s,
 -                         OutputStream *ost,
 -                         InputStream *ist,
 -                         AVFrame *in_picture,
 -                         int *frame_size, float quality)
 +static void do_video_resample(OutputStream *ost,
 +                              InputStream *ist,
 +                              AVFrame *in_picture,
 +                              AVFrame **out_picture)
  {
 -    int nb_frames, i, ret, resample_changed;
 -    AVFrame *final_picture, *formatted_picture;
 -    AVCodecContext *enc, *dec;
 -    double sync_ipts;
 +#if CONFIG_AVFILTER
 +    *out_picture = in_picture;
 +#else
 +    AVCodecContext *dec = ist->st->codec;
 +    AVCodecContext *enc = ost->st->codec;
-     int resample_changed = ost->resample_width   != dec->width  ||
-                            ost->resample_height  != dec->height ||
-                            ost->resample_pix_fmt != dec->pix_fmt;
++    int resample_changed = ost->resample_width   != in_picture->width  ||
++                           ost->resample_height  != in_picture->height ||
++                           ost->resample_pix_fmt != in_picture->format;
  
 -    enc = ost->st->codec;
 -    dec = ist->st->codec;
 +    *out_picture = in_picture;
 +    if (resample_changed) {
 +        av_log(NULL, AV_LOG_INFO,
-                "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
++               "Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s / frm size:%dx%d fmt:%s\n",
 +               ist->file_index, ist->st->index,
 +               ost->resample_width, ost->resample_height, av_get_pix_fmt_name(ost->resample_pix_fmt),
-                dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt));
-         ost->resample_width   = dec->width;
-         ost->resample_height  = dec->height;
-         ost->resample_pix_fmt = dec->pix_fmt;
++               dec->width         , dec->height         , av_get_pix_fmt_name(dec->pix_fmt),
++               in_picture->width, in_picture->height, av_get_pix_fmt_name(in_picture->format));
++        ost->resample_width   = in_picture->width;
++        ost->resample_height  = in_picture->height;
++        ost->resample_pix_fmt = in_picture->format;
 +    }
 +
-     ost->video_resample = dec->width   != enc->width  ||
-                           dec->height  != enc->height ||
-                           dec->pix_fmt != enc->pix_fmt;
++    ost->video_resample = in_picture->width   != enc->width  ||
++                          in_picture->height  != enc->height ||
++                          in_picture->format  != enc->pix_fmt;
 +
 +    if (ost->video_resample) {
 +        *out_picture = &ost->resample_frame;
 +        if (!ost->img_resample_ctx || resample_changed) {
 +            /* initialize the destination picture */
 +            if (!ost->resample_frame.data[0]) {
 +                avcodec_get_frame_defaults(&ost->resample_frame);
 +                if (avpicture_alloc((AVPicture *)&ost->resample_frame, enc->pix_fmt,
 +                                    enc->width, enc->height)) {
 +                    av_log(NULL, AV_LOG_FATAL, "Cannot allocate temp picture, check pix fmt\n");
 +                    exit_program(1);
 +                }
 +            }
 +            /* initialize a new scaler context */
 +            sws_freeContext(ost->img_resample_ctx);
-             ost->img_resample_ctx = sws_getContext(dec->width, dec->height, dec->pix_fmt,
++            ost->img_resample_ctx = sws_getContext(in_picture->width, in_picture->height, in_picture->format,
 +                                                   enc->width, enc->height, enc->pix_fmt,
 +                                                   ost->sws_flags, NULL, NULL, NULL);
 +            if (ost->img_resample_ctx == NULL) {
 +                av_log(NULL, AV_LOG_FATAL, "Cannot get resampling context\n");
 +                exit_program(1);
 +            }
 +        }
 +        sws_scale(ost->img_resample_ctx, in_picture->data, in_picture->linesize,
 +              0, ost->resample_height, (*out_picture)->data, (*out_picture)->linesize);
 +    }
 +#endif
 +}
 +
 +
 +static void do_video_out(AVFormatContext *s,
 +                         OutputStream *ost,
 +                         InputStream *ist,
 +                         AVFrame *in_picture,
 +                         int *frame_size, float quality)
 +{
 +    int nb_frames, i, ret, format_video_sync;
 +    AVFrame *final_picture;
 +    AVCodecContext *enc;
 +    double sync_ipts;
 +    double duration = 0;
 +
 +    enc = ost->st->codec;
 +
 +    if (ist->st->start_time != AV_NOPTS_VALUE && ist->st->first_dts != AV_NOPTS_VALUE) {
 +        duration = FFMAX(av_q2d(ist->st->time_base), av_q2d(ist->st->codec->time_base));
 +        if(ist->st->avg_frame_rate.num)
 +            duration= FFMAX(duration, 1/av_q2d(ist->st->avg_frame_rate));
 +
 +        duration /= av_q2d(enc->time_base);
 +    }
  
      sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base);
  
diff --cc ffprobe.c
index 954a829c4bad6a49488ab32a2db30b1a6c287e7c,0000000000000000000000000000000000000000..61c66aef1a22b971bef109aca3bd7ca643d1f270
mode 100644,000000..100644
--- /dev/null
+++ b/ffprobe.c
@@@ -1,1831 -1,0 +1,1831 @@@
-     int64_t size = avio_size(fmt_ctx->pb);
 +/*
 + * Copyright (c) 2007-2010 Stefano Sabatini
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +/**
 + * @file
 + * simple media prober based on the FFmpeg libraries
 + */
 +
 +#include "config.h"
 +#include "version.h"
 +
 +#include "libavformat/avformat.h"
 +#include "libavcodec/avcodec.h"
 +#include "libavutil/avstring.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/dict.h"
 +#include "libavdevice/avdevice.h"
 +#include "libswscale/swscale.h"
 +#include "libswresample/swresample.h"
 +#include "libpostproc/postprocess.h"
 +#include "cmdutils.h"
 +
 +const char program_name[] = "ffprobe";
 +const int program_birth_year = 2007;
 +
 +static int do_show_error   = 0;
 +static int do_show_format  = 0;
 +static int do_show_frames  = 0;
 +static int do_show_packets = 0;
 +static int do_show_streams = 0;
 +static int do_show_program_version  = 0;
 +static int do_show_library_versions = 0;
 +
 +static int show_value_unit              = 0;
 +static int use_value_prefix             = 0;
 +static int use_byte_value_binary_prefix = 0;
 +static int use_value_sexagesimal_format = 0;
 +static int show_private_data            = 1;
 +
 +static char *print_format;
 +
 +static const OptionDef options[];
 +
 +/* FFprobe context */
 +static const char *input_filename;
 +static AVInputFormat *iformat = NULL;
 +
 +static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
 +static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P"  };
 +
 +static const char *unit_second_str          = "s"    ;
 +static const char *unit_hertz_str           = "Hz"   ;
 +static const char *unit_byte_str            = "byte" ;
 +static const char *unit_bit_per_second_str  = "bit/s";
 +
 +void av_noreturn exit_program(int ret)
 +{
 +    exit(ret);
 +}
 +
 +struct unit_value {
 +    union { double d; int i; } val;
 +    const char *unit;
 +};
 +
 +static char *value_string(char *buf, int buf_size, struct unit_value uv)
 +{
 +    double vald;
 +    int show_float = 0;
 +
 +    if (uv.unit == unit_second_str) {
 +        vald = uv.val.d;
 +        show_float = 1;
 +    } else {
 +        vald = uv.val.i;
 +    }
 +
 +    if (uv.unit == unit_second_str && use_value_sexagesimal_format) {
 +        double secs;
 +        int hours, mins;
 +        secs  = vald;
 +        mins  = (int)secs / 60;
 +        secs  = secs - mins * 60;
 +        hours = mins / 60;
 +        mins %= 60;
 +        snprintf(buf, buf_size, "%d:%02d:%09.6f", hours, mins, secs);
 +    } else if (use_value_prefix) {
 +        const char *prefix_string;
 +        int index, l;
 +
 +        if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) {
 +            index = (int) (log(vald)/log(2)) / 10;
 +            index = av_clip(index, 0, FF_ARRAY_ELEMS(binary_unit_prefixes) -1);
 +            vald /= pow(2, index*10);
 +            prefix_string = binary_unit_prefixes[index];
 +        } else {
 +            index = (int) (log10(vald)) / 3;
 +            index = av_clip(index, 0, FF_ARRAY_ELEMS(decimal_unit_prefixes) -1);
 +            vald /= pow(10, index*3);
 +            prefix_string = decimal_unit_prefixes[index];
 +        }
 +
 +        if (show_float || vald != (int)vald) l = snprintf(buf, buf_size, "%.3f", vald);
 +        else                                 l = snprintf(buf, buf_size, "%d",   (int)vald);
 +        snprintf(buf+l, buf_size-l, "%s%s%s", prefix_string || show_value_unit ? " " : "",
 +                 prefix_string, show_value_unit ? uv.unit : "");
 +    } else {
 +        int l;
 +
 +        if (show_float) l = snprintf(buf, buf_size, "%.3f", vald);
 +        else            l = snprintf(buf, buf_size, "%d",   (int)vald);
 +        snprintf(buf+l, buf_size-l, "%s%s", show_value_unit ? " " : "",
 +                 show_value_unit ? uv.unit : "");
 +    }
 +
 +    return buf;
 +}
 +
 +/* WRITERS API */
 +
 +typedef struct WriterContext WriterContext;
 +
 +#define WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS 1
 +#define WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER 2
 +
 +typedef struct Writer {
 +    int priv_size;                  ///< private size for the writer context
 +    const char *name;
 +
 +    int  (*init)  (WriterContext *wctx, const char *args, void *opaque);
 +    void (*uninit)(WriterContext *wctx);
 +
 +    void (*print_header)(WriterContext *ctx);
 +    void (*print_footer)(WriterContext *ctx);
 +
 +    void (*print_chapter_header)(WriterContext *wctx, const char *);
 +    void (*print_chapter_footer)(WriterContext *wctx, const char *);
 +    void (*print_section_header)(WriterContext *wctx, const char *);
 +    void (*print_section_footer)(WriterContext *wctx, const char *);
 +    void (*print_integer)       (WriterContext *wctx, const char *, long long int);
 +    void (*print_string)        (WriterContext *wctx, const char *, const char *);
 +    void (*show_tags)           (WriterContext *wctx, AVDictionary *dict);
 +    int flags;                  ///< a combination or WRITER_FLAG_*
 +} Writer;
 +
 +struct WriterContext {
 +    const AVClass *class;           ///< class of the writer
 +    const Writer *writer;           ///< the Writer of which this is an instance
 +    char *name;                     ///< name of this writer instance
 +    void *priv;                     ///< private data for use by the filter
 +    unsigned int nb_item;           ///< number of the item printed in the given section, starting at 0
 +    unsigned int nb_section;        ///< number of the section printed in the given section sequence, starting at 0
 +    unsigned int nb_chapter;        ///< number of the chapter, starting at 0
 +};
 +
 +static const char *writer_get_name(void *p)
 +{
 +    WriterContext *wctx = p;
 +    return wctx->writer->name;
 +}
 +
 +static const AVClass writer_class = {
 +    "Writer",
 +    writer_get_name,
 +    NULL,
 +    LIBAVUTIL_VERSION_INT,
 +};
 +
 +static void writer_close(WriterContext **wctx)
 +{
 +    if (!*wctx)
 +        return;
 +
 +    if ((*wctx)->writer->uninit)
 +        (*wctx)->writer->uninit(*wctx);
 +    av_freep(&((*wctx)->priv));
 +    av_freep(wctx);
 +}
 +
 +static int writer_open(WriterContext **wctx, const Writer *writer,
 +                       const char *args, void *opaque)
 +{
 +    int ret = 0;
 +
 +    if (!(*wctx = av_malloc(sizeof(WriterContext)))) {
 +        ret = AVERROR(ENOMEM);
 +        goto fail;
 +    }
 +
 +    if (!((*wctx)->priv = av_mallocz(writer->priv_size))) {
 +        ret = AVERROR(ENOMEM);
 +        goto fail;
 +    }
 +
 +    (*wctx)->class = &writer_class;
 +    (*wctx)->writer = writer;
 +    if ((*wctx)->writer->init)
 +        ret = (*wctx)->writer->init(*wctx, args, opaque);
 +    if (ret < 0)
 +        goto fail;
 +
 +    return 0;
 +
 +fail:
 +    writer_close(wctx);
 +    return ret;
 +}
 +
 +static inline void writer_print_header(WriterContext *wctx)
 +{
 +    if (wctx->writer->print_header)
 +        wctx->writer->print_header(wctx);
 +    wctx->nb_chapter = 0;
 +}
 +
 +static inline void writer_print_footer(WriterContext *wctx)
 +{
 +    if (wctx->writer->print_footer)
 +        wctx->writer->print_footer(wctx);
 +}
 +
 +static inline void writer_print_chapter_header(WriterContext *wctx,
 +                                               const char *chapter)
 +{
 +    if (wctx->writer->print_chapter_header)
 +        wctx->writer->print_chapter_header(wctx, chapter);
 +    wctx->nb_section = 0;
 +}
 +
 +static inline void writer_print_chapter_footer(WriterContext *wctx,
 +                                               const char *chapter)
 +{
 +    if (wctx->writer->print_chapter_footer)
 +        wctx->writer->print_chapter_footer(wctx, chapter);
 +    wctx->nb_chapter++;
 +}
 +
 +static inline void writer_print_section_header(WriterContext *wctx,
 +                                               const char *section)
 +{
 +    if (wctx->writer->print_section_header)
 +        wctx->writer->print_section_header(wctx, section);
 +    wctx->nb_item = 0;
 +}
 +
 +static inline void writer_print_section_footer(WriterContext *wctx,
 +                                               const char *section)
 +{
 +    if (wctx->writer->print_section_footer)
 +        wctx->writer->print_section_footer(wctx, section);
 +    wctx->nb_section++;
 +}
 +
 +static inline void writer_print_integer(WriterContext *wctx,
 +                                        const char *key, long long int val)
 +{
 +    wctx->writer->print_integer(wctx, key, val);
 +    wctx->nb_item++;
 +}
 +
 +static inline void writer_print_string(WriterContext *wctx,
 +                                       const char *key, const char *val, int opt)
 +{
 +    if (opt && !(wctx->writer->flags & WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS))
 +        return;
 +    wctx->writer->print_string(wctx, key, val);
 +    wctx->nb_item++;
 +}
 +
 +static void writer_print_time(WriterContext *wctx, const char *key,
 +                              int64_t ts, const AVRational *time_base)
 +{
 +    char buf[128];
 +
 +    if (ts == AV_NOPTS_VALUE) {
 +        writer_print_string(wctx, key, "N/A", 1);
 +    } else {
 +        double d = ts * av_q2d(*time_base);
 +        value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str});
 +        writer_print_string(wctx, key, buf, 0);
 +    }
 +}
 +
 +static void writer_print_ts(WriterContext *wctx, const char *key, int64_t ts)
 +{
 +    if (ts == AV_NOPTS_VALUE) {
 +        writer_print_string(wctx, key, "N/A", 1);
 +    } else {
 +        writer_print_integer(wctx, key, ts);
 +    }
 +}
 +
 +static inline void writer_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    wctx->writer->show_tags(wctx, dict);
 +}
 +
 +#define MAX_REGISTERED_WRITERS_NB 64
 +
 +static const Writer *registered_writers[MAX_REGISTERED_WRITERS_NB + 1];
 +
 +static int writer_register(const Writer *writer)
 +{
 +    static int next_registered_writer_idx = 0;
 +
 +    if (next_registered_writer_idx == MAX_REGISTERED_WRITERS_NB)
 +        return AVERROR(ENOMEM);
 +
 +    registered_writers[next_registered_writer_idx++] = writer;
 +    return 0;
 +}
 +
 +static const Writer *writer_get_by_name(const char *name)
 +{
 +    int i;
 +
 +    for (i = 0; registered_writers[i]; i++)
 +        if (!strcmp(registered_writers[i]->name, name))
 +            return registered_writers[i];
 +
 +    return NULL;
 +}
 +
 +/* Print helpers */
 +
 +struct print_buf {
 +    char *s;
 +    int len;
 +};
 +
 +static char *fast_asprintf(struct print_buf *pbuf, const char *fmt, ...)
 +{
 +    va_list va;
 +    int len;
 +
 +    va_start(va, fmt);
 +    len = vsnprintf(NULL, 0, fmt, va);
 +    va_end(va);
 +    if (len < 0)
 +        goto fail;
 +
 +    if (pbuf->len < len) {
 +        char *p = av_realloc(pbuf->s, len + 1);
 +        if (!p)
 +            goto fail;
 +        pbuf->s   = p;
 +        pbuf->len = len;
 +    }
 +
 +    va_start(va, fmt);
 +    len = vsnprintf(pbuf->s, len + 1, fmt, va);
 +    va_end(va);
 +    if (len < 0)
 +        goto fail;
 +    return pbuf->s;
 +
 +fail:
 +    av_freep(&pbuf->s);
 +    pbuf->len = 0;
 +    return NULL;
 +}
 +
 +#define ESCAPE_INIT_BUF_SIZE 256
 +
 +#define ESCAPE_CHECK_SIZE(src, size, max_size)                          \
 +    if (size > max_size) {                                              \
 +        char buf[64];                                                   \
 +        snprintf(buf, sizeof(buf), "%s", src);                          \
 +        av_log(log_ctx, AV_LOG_WARNING,                                 \
 +               "String '%s...' with is too big\n", buf);                \
 +        return "FFPROBE_TOO_BIG_STRING";                                \
 +    }
 +
 +#define ESCAPE_REALLOC_BUF(dst_size_p, dst_p, src, size)                \
 +    if (*dst_size_p < size) {                                           \
 +        char *q = av_realloc(*dst_p, size);                             \
 +        if (!q) {                                                       \
 +            char buf[64];                                               \
 +            snprintf(buf, sizeof(buf), "%s", src);                      \
 +            av_log(log_ctx, AV_LOG_WARNING,                             \
 +                   "String '%s...' could not be escaped\n", buf);       \
 +            return "FFPROBE_THIS_STRING_COULD_NOT_BE_ESCAPED";          \
 +        }                                                               \
 +        *dst_size_p = size;                                             \
 +        *dst = q;                                                       \
 +    }
 +
 +/* WRITERS */
 +
 +/* Default output */
 +
 +static void default_print_footer(WriterContext *wctx)
 +{
 +    printf("\n");
 +}
 +
 +static void default_print_chapter_header(WriterContext *wctx, const char *chapter)
 +{
 +    if (wctx->nb_chapter)
 +        printf("\n");
 +}
 +
 +/* lame uppercasing routine, assumes the string is lower case ASCII */
 +static inline char *upcase_string(char *dst, size_t dst_size, const char *src)
 +{
 +    int i;
 +    for (i = 0; src[i] && i < dst_size-1; i++)
 +        dst[i] = av_toupper(src[i]);
 +    dst[i] = 0;
 +    return dst;
 +}
 +
 +static void default_print_section_header(WriterContext *wctx, const char *section)
 +{
 +    char buf[32];
 +
 +    if (wctx->nb_section)
 +        printf("\n");
 +    printf("[%s]\n", upcase_string(buf, sizeof(buf), section));
 +}
 +
 +static void default_print_section_footer(WriterContext *wctx, const char *section)
 +{
 +    char buf[32];
 +
 +    printf("[/%s]", upcase_string(buf, sizeof(buf), section));
 +}
 +
 +static void default_print_str(WriterContext *wctx, const char *key, const char *value)
 +{
 +    printf("%s=%s\n", key, value);
 +}
 +
 +static void default_print_int(WriterContext *wctx, const char *key, long long int value)
 +{
 +    printf("%s=%lld\n", key, value);
 +}
 +
 +static void default_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    AVDictionaryEntry *tag = NULL;
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        printf("TAG:");
 +        writer_print_string(wctx, tag->key, tag->value, 0);
 +    }
 +}
 +
 +static const Writer default_writer = {
 +    .name                  = "default",
 +    .print_footer          = default_print_footer,
 +    .print_chapter_header  = default_print_chapter_header,
 +    .print_section_header  = default_print_section_header,
 +    .print_section_footer  = default_print_section_footer,
 +    .print_integer         = default_print_int,
 +    .print_string          = default_print_str,
 +    .show_tags             = default_show_tags,
 +    .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS,
 +};
 +
 +/* Compact output */
 +
 +/**
 + * Escape \n, \r, \\ and sep characters contained in s, and print the
 + * resulting string.
 + */
 +static const char *c_escape_str(char **dst, size_t *dst_size,
 +                                const char *src, const char sep, void *log_ctx)
 +{
 +    const char *p;
 +    char *q;
 +    size_t size = 1;
 +
 +    /* precompute size */
 +    for (p = src; *p; p++, size++) {
 +        ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-2);
 +        if (*p == '\n' || *p == '\r' || *p == '\\')
 +            size++;
 +    }
 +
 +    ESCAPE_REALLOC_BUF(dst_size, dst, src, size);
 +
 +    q = *dst;
 +    for (p = src; *p; p++) {
 +        switch (*src) {
 +        case '\n': *q++ = '\\'; *q++ = 'n';  break;
 +        case '\r': *q++ = '\\'; *q++ = 'r';  break;
 +        case '\\': *q++ = '\\'; *q++ = '\\'; break;
 +        default:
 +            if (*p == sep)
 +                *q++ = '\\';
 +            *q++ = *p;
 +        }
 +    }
 +    *q = 0;
 +    return *dst;
 +}
 +
 +/**
 + * Quote fields containing special characters, check RFC4180.
 + */
 +static const char *csv_escape_str(char **dst, size_t *dst_size,
 +                                  const char *src, const char sep, void *log_ctx)
 +{
 +    const char *p;
 +    char *q;
 +    size_t size = 1;
 +    int quote = 0;
 +
 +    /* precompute size */
 +    for (p = src; *p; p++, size++) {
 +        ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-4);
 +        if (*p == '"' || *p == sep || *p == '\n' || *p == '\r')
 +            if (!quote) {
 +                quote = 1;
 +                size += 2;
 +            }
 +        if (*p == '"')
 +            size++;
 +    }
 +
 +    ESCAPE_REALLOC_BUF(dst_size, dst, src, size);
 +
 +    q = *dst;
 +    p = src;
 +    if (quote)
 +        *q++ = '\"';
 +    while (*p) {
 +        if (*p == '"')
 +            *q++ = '\"';
 +        *q++ = *p++;
 +    }
 +    if (quote)
 +        *q++ = '\"';
 +    *q = 0;
 +
 +    return *dst;
 +}
 +
 +static const char *none_escape_str(char **dst, size_t *dst_size,
 +                                   const char *src, const char sep, void *log_ctx)
 +{
 +    return src;
 +}
 +
 +typedef struct CompactContext {
 +    const AVClass *class;
 +    char *item_sep_str;
 +    char item_sep;
 +    int nokey;
 +    char  *buf;
 +    size_t buf_size;
 +    char *escape_mode_str;
 +    const char * (*escape_str)(char **dst, size_t *dst_size,
 +                               const char *src, const char sep, void *log_ctx);
 +} CompactContext;
 +
 +#define OFFSET(x) offsetof(CompactContext, x)
 +
 +static const AVOption compact_options[]= {
 +    {"item_sep", "set item separator",    OFFSET(item_sep_str),    AV_OPT_TYPE_STRING, {.str="|"},  CHAR_MIN, CHAR_MAX },
 +    {"s",        "set item separator",    OFFSET(item_sep_str),    AV_OPT_TYPE_STRING, {.str="|"},  CHAR_MIN, CHAR_MAX },
 +    {"nokey",    "force no key printing", OFFSET(nokey),           AV_OPT_TYPE_INT,    {.dbl=0},    0,        1        },
 +    {"nk",       "force no key printing", OFFSET(nokey),           AV_OPT_TYPE_INT,    {.dbl=0},    0,        1        },
 +    {"escape",   "set escape mode",       OFFSET(escape_mode_str), AV_OPT_TYPE_STRING, {.str="c"},  CHAR_MIN, CHAR_MAX },
 +    {"e",        "set escape mode",       OFFSET(escape_mode_str), AV_OPT_TYPE_STRING, {.str="c"},  CHAR_MIN, CHAR_MAX },
 +    {NULL},
 +};
 +
 +static const char *compact_get_name(void *ctx)
 +{
 +    return "compact";
 +}
 +
 +static const AVClass compact_class = {
 +    "CompactContext",
 +    compact_get_name,
 +    compact_options
 +};
 +
 +static av_cold int compact_init(WriterContext *wctx, const char *args, void *opaque)
 +{
 +    CompactContext *compact = wctx->priv;
 +    int err;
 +
 +    compact->class = &compact_class;
 +    av_opt_set_defaults(compact);
 +
 +    if (args &&
 +        (err = (av_set_options_string(compact, args, "=", ":"))) < 0) {
 +        av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
 +        return err;
 +    }
 +    if (strlen(compact->item_sep_str) != 1) {
 +        av_log(wctx, AV_LOG_ERROR, "Item separator '%s' specified, but must contain a single character\n",
 +               compact->item_sep_str);
 +        return AVERROR(EINVAL);
 +    }
 +    compact->item_sep = compact->item_sep_str[0];
 +
 +    compact->buf_size = ESCAPE_INIT_BUF_SIZE;
 +    if (!(compact->buf = av_malloc(compact->buf_size)))
 +        return AVERROR(ENOMEM);
 +
 +    if      (!strcmp(compact->escape_mode_str, "none")) compact->escape_str = none_escape_str;
 +    else if (!strcmp(compact->escape_mode_str, "c"   )) compact->escape_str = c_escape_str;
 +    else if (!strcmp(compact->escape_mode_str, "csv" )) compact->escape_str = csv_escape_str;
 +    else {
 +        av_log(wctx, AV_LOG_ERROR, "Unknown escape mode '%s'\n", compact->escape_mode_str);
 +        return AVERROR(EINVAL);
 +    }
 +
 +    return 0;
 +}
 +
 +static av_cold void compact_uninit(WriterContext *wctx)
 +{
 +    CompactContext *compact = wctx->priv;
 +
 +    av_freep(&compact->item_sep_str);
 +    av_freep(&compact->buf);
 +    av_freep(&compact->escape_mode_str);
 +}
 +
 +static void compact_print_section_header(WriterContext *wctx, const char *section)
 +{
 +    CompactContext *compact = wctx->priv;
 +
 +    printf("%s%c", section, compact->item_sep);
 +}
 +
 +static void compact_print_section_footer(WriterContext *wctx, const char *section)
 +{
 +    printf("\n");
 +}
 +
 +static void compact_print_str(WriterContext *wctx, const char *key, const char *value)
 +{
 +    CompactContext *compact = wctx->priv;
 +
 +    if (wctx->nb_item) printf("%c", compact->item_sep);
 +    if (!compact->nokey)
 +        printf("%s=", key);
 +    printf("%s", compact->escape_str(&compact->buf, &compact->buf_size,
 +                                     value, compact->item_sep, wctx));
 +}
 +
 +static void compact_print_int(WriterContext *wctx, const char *key, long long int value)
 +{
 +    CompactContext *compact = wctx->priv;
 +
 +    if (wctx->nb_item) printf("%c", compact->item_sep);
 +    if (!compact->nokey)
 +        printf("%s=", key);
 +    printf("%lld", value);
 +}
 +
 +static void compact_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    CompactContext *compact = wctx->priv;
 +    AVDictionaryEntry *tag = NULL;
 +
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        if (wctx->nb_item) printf("%c", compact->item_sep);
 +        if (!compact->nokey)
 +            printf("tag:%s=", compact->escape_str(&compact->buf, &compact->buf_size,
 +                                                  tag->key, compact->item_sep, wctx));
 +        printf("%s", compact->escape_str(&compact->buf, &compact->buf_size,
 +                                         tag->value, compact->item_sep, wctx));
 +    }
 +}
 +
 +static const Writer compact_writer = {
 +    .name                 = "compact",
 +    .priv_size            = sizeof(CompactContext),
 +    .init                 = compact_init,
 +    .uninit               = compact_uninit,
 +    .print_section_header = compact_print_section_header,
 +    .print_section_footer = compact_print_section_footer,
 +    .print_integer        = compact_print_int,
 +    .print_string         = compact_print_str,
 +    .show_tags            = compact_show_tags,
 +    .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS,
 +};
 +
 +/* CSV output */
 +
 +static av_cold int csv_init(WriterContext *wctx, const char *args, void *opaque)
 +{
 +    return compact_init(wctx, "item_sep=,:nokey=1:escape=csv", opaque);
 +}
 +
 +static const Writer csv_writer = {
 +    .name                 = "csv",
 +    .priv_size            = sizeof(CompactContext),
 +    .init                 = csv_init,
 +    .uninit               = compact_uninit,
 +    .print_section_header = compact_print_section_header,
 +    .print_section_footer = compact_print_section_footer,
 +    .print_integer        = compact_print_int,
 +    .print_string         = compact_print_str,
 +    .show_tags            = compact_show_tags,
 +    .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS,
 +};
 +
 +/* JSON output */
 +
 +typedef struct {
 +    const AVClass *class;
 +    int multiple_entries; ///< tells if the given chapter requires multiple entries
 +    char *buf;
 +    size_t buf_size;
 +    int print_packets_and_frames;
 +    int indent_level;
 +    int compact;
 +    const char *item_sep, *item_start_end;
 +} JSONContext;
 +
 +#undef OFFSET
 +#define OFFSET(x) offsetof(JSONContext, x)
 +
 +static const AVOption json_options[]= {
 +    { "compact", "enable compact output", OFFSET(compact), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1 },
 +    { "c",       "enable compact output", OFFSET(compact), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1 },
 +    { NULL }
 +};
 +
 +static const char *json_get_name(void *ctx)
 +{
 +    return "json";
 +}
 +
 +static const AVClass json_class = {
 +    "JSONContext",
 +    json_get_name,
 +    json_options
 +};
 +
 +static av_cold int json_init(WriterContext *wctx, const char *args, void *opaque)
 +{
 +    JSONContext *json = wctx->priv;
 +    int err;
 +
 +    json->class = &json_class;
 +    av_opt_set_defaults(json);
 +
 +    if (args &&
 +        (err = (av_set_options_string(json, args, "=", ":"))) < 0) {
 +        av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
 +        return err;
 +    }
 +
 +    json->item_sep       = json->compact ? ", " : ",\n";
 +    json->item_start_end = json->compact ? " "  : "\n";
 +
 +    json->buf_size = ESCAPE_INIT_BUF_SIZE;
 +    if (!(json->buf = av_malloc(json->buf_size)))
 +        return AVERROR(ENOMEM);
 +
 +    return 0;
 +}
 +
 +static av_cold void json_uninit(WriterContext *wctx)
 +{
 +    JSONContext *json = wctx->priv;
 +    av_freep(&json->buf);
 +}
 +
 +static const char *json_escape_str(char **dst, size_t *dst_size, const char *src,
 +                                   void *log_ctx)
 +{
 +    static const char json_escape[] = {'"', '\\', '\b', '\f', '\n', '\r', '\t', 0};
 +    static const char json_subst[]  = {'"', '\\',  'b',  'f',  'n',  'r',  't', 0};
 +    const char *p;
 +    char *q;
 +    size_t size = 1;
 +
 +    // compute the length of the escaped string
 +    for (p = src; *p; p++) {
 +        ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-6);
 +        if (strchr(json_escape, *p))     size += 2; // simple escape
 +        else if ((unsigned char)*p < 32) size += 6; // handle non-printable chars
 +        else                             size += 1; // char copy
 +    }
 +    ESCAPE_REALLOC_BUF(dst_size, dst, src, size);
 +
 +    q = *dst;
 +    for (p = src; *p; p++) {
 +        char *s = strchr(json_escape, *p);
 +        if (s) {
 +            *q++ = '\\';
 +            *q++ = json_subst[s - json_escape];
 +        } else if ((unsigned char)*p < 32) {
 +            snprintf(q, 7, "\\u00%02x", *p & 0xff);
 +            q += 6;
 +        } else {
 +            *q++ = *p;
 +        }
 +    }
 +    *q = 0;
 +    return *dst;
 +}
 +
 +static void json_print_header(WriterContext *wctx)
 +{
 +    JSONContext *json = wctx->priv;
 +    printf("{");
 +    json->indent_level++;
 +}
 +
 +static void json_print_footer(WriterContext *wctx)
 +{
 +    JSONContext *json = wctx->priv;
 +    json->indent_level--;
 +    printf("\n}\n");
 +}
 +
 +#define JSON_INDENT() printf("%*c", json->indent_level * 4, ' ')
 +
 +static void json_print_chapter_header(WriterContext *wctx, const char *chapter)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (wctx->nb_chapter)
 +        printf(",");
 +    printf("\n");
 +    json->multiple_entries = !strcmp(chapter, "packets") || !strcmp(chapter, "frames" ) ||
 +                             !strcmp(chapter, "packets_and_frames") ||
 +                             !strcmp(chapter, "streams") || !strcmp(chapter, "library_versions");
 +    if (json->multiple_entries) {
 +        JSON_INDENT();
 +        printf("\"%s\": [\n", json_escape_str(&json->buf, &json->buf_size, chapter, wctx));
 +        json->print_packets_and_frames = !strcmp(chapter, "packets_and_frames");
 +        json->indent_level++;
 +    }
 +}
 +
 +static void json_print_chapter_footer(WriterContext *wctx, const char *chapter)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (json->multiple_entries) {
 +        printf("\n");
 +        json->indent_level--;
 +        JSON_INDENT();
 +        printf("]");
 +    }
 +}
 +
 +static void json_print_section_header(WriterContext *wctx, const char *section)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (wctx->nb_section)
 +        printf(",\n");
 +    JSON_INDENT();
 +    if (!json->multiple_entries)
 +        printf("\"%s\": ", section);
 +    printf("{%s", json->item_start_end);
 +    json->indent_level++;
 +    /* this is required so the parser can distinguish between packets and frames */
 +    if (json->print_packets_and_frames) {
 +        if (!json->compact)
 +            JSON_INDENT();
 +        printf("\"type\": \"%s\"%s", section, json->item_sep);
 +    }
 +}
 +
 +static void json_print_section_footer(WriterContext *wctx, const char *section)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    printf("%s", json->item_start_end);
 +    json->indent_level--;
 +    if (!json->compact)
 +        JSON_INDENT();
 +    printf("}");
 +}
 +
 +static inline void json_print_item_str(WriterContext *wctx,
 +                                       const char *key, const char *value)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    printf("\"%s\":", json_escape_str(&json->buf, &json->buf_size, key,   wctx));
 +    printf(" \"%s\"", json_escape_str(&json->buf, &json->buf_size, value, wctx));
 +}
 +
 +static void json_print_str(WriterContext *wctx, const char *key, const char *value)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (wctx->nb_item) printf("%s", json->item_sep);
 +    if (!json->compact)
 +        JSON_INDENT();
 +    json_print_item_str(wctx, key, value);
 +}
 +
 +static void json_print_int(WriterContext *wctx, const char *key, long long int value)
 +{
 +    JSONContext *json = wctx->priv;
 +
 +    if (wctx->nb_item) printf("%s", json->item_sep);
 +    if (!json->compact)
 +        JSON_INDENT();
 +    printf("\"%s\": %lld",
 +           json_escape_str(&json->buf, &json->buf_size, key, wctx), value);
 +}
 +
 +static void json_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    JSONContext *json = wctx->priv;
 +    AVDictionaryEntry *tag = NULL;
 +    int is_first = 1;
 +    if (!dict)
 +        return;
 +    printf("%s", json->item_sep);
 +    if (!json->compact)
 +        JSON_INDENT();
 +    printf("\"tags\": {%s", json->item_start_end);
 +    json->indent_level++;
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        if (is_first) is_first = 0;
 +        else          printf("%s", json->item_sep);
 +        if (!json->compact)
 +            JSON_INDENT();
 +        json_print_item_str(wctx, tag->key, tag->value);
 +    }
 +    json->indent_level--;
 +    printf("%s", json->item_start_end);
 +    if (!json->compact)
 +        JSON_INDENT();
 +    printf("}");
 +}
 +
 +static const Writer json_writer = {
 +    .name                 = "json",
 +    .priv_size            = sizeof(JSONContext),
 +    .init                 = json_init,
 +    .uninit               = json_uninit,
 +    .print_header         = json_print_header,
 +    .print_footer         = json_print_footer,
 +    .print_chapter_header = json_print_chapter_header,
 +    .print_chapter_footer = json_print_chapter_footer,
 +    .print_section_header = json_print_section_header,
 +    .print_section_footer = json_print_section_footer,
 +    .print_integer        = json_print_int,
 +    .print_string         = json_print_str,
 +    .show_tags            = json_show_tags,
 +    .flags = WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER,
 +};
 +
 +/* XML output */
 +
 +typedef struct {
 +    const AVClass *class;
 +    int within_tag;
 +    int multiple_entries; ///< tells if the given chapter requires multiple entries
 +    int indent_level;
 +    int fully_qualified;
 +    int xsd_strict;
 +    char *buf;
 +    size_t buf_size;
 +} XMLContext;
 +
 +#undef OFFSET
 +#define OFFSET(x) offsetof(XMLContext, x)
 +
 +static const AVOption xml_options[] = {
 +    {"fully_qualified", "specify if the output should be fully qualified", OFFSET(fully_qualified), AV_OPT_TYPE_INT, {.dbl=0},  0, 1 },
 +    {"q",               "specify if the output should be fully qualified", OFFSET(fully_qualified), AV_OPT_TYPE_INT, {.dbl=0},  0, 1 },
 +    {"xsd_strict",      "ensure that the output is XSD compliant",         OFFSET(xsd_strict),      AV_OPT_TYPE_INT, {.dbl=0},  0, 1 },
 +    {"x",               "ensure that the output is XSD compliant",         OFFSET(xsd_strict),      AV_OPT_TYPE_INT, {.dbl=0},  0, 1 },
 +    {NULL},
 +};
 +
 +static const char *xml_get_name(void *ctx)
 +{
 +    return "xml";
 +}
 +
 +static const AVClass xml_class = {
 +    "XMLContext",
 +    xml_get_name,
 +    xml_options
 +};
 +
 +static av_cold int xml_init(WriterContext *wctx, const char *args, void *opaque)
 +{
 +    XMLContext *xml = wctx->priv;
 +    int err;
 +
 +    xml->class = &xml_class;
 +    av_opt_set_defaults(xml);
 +
 +    if (args &&
 +        (err = (av_set_options_string(xml, args, "=", ":"))) < 0) {
 +        av_log(wctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
 +        return err;
 +    }
 +
 +    if (xml->xsd_strict) {
 +        xml->fully_qualified = 1;
 +#define CHECK_COMPLIANCE(opt, opt_name)                                 \
 +        if (opt) {                                                      \
 +            av_log(wctx, AV_LOG_ERROR,                                  \
 +                   "XSD-compliant output selected but option '%s' was selected, XML output may be non-compliant.\n" \
 +                   "You need to disable such option with '-no%s'\n", opt_name, opt_name); \
 +            return AVERROR(EINVAL);                                     \
 +        }
 +        CHECK_COMPLIANCE(show_private_data, "private");
 +        CHECK_COMPLIANCE(show_value_unit,   "unit");
 +        CHECK_COMPLIANCE(use_value_prefix,  "prefix");
 +
 +        if (do_show_frames && do_show_packets) {
 +            av_log(wctx, AV_LOG_ERROR,
 +                   "Interleaved frames and packets are not allowed in XSD. "
 +                   "Select only one between the -show_frames and the -show_packets options.\n");
 +            return AVERROR(EINVAL);
 +        }
 +    }
 +
 +    xml->buf_size = ESCAPE_INIT_BUF_SIZE;
 +    if (!(xml->buf = av_malloc(xml->buf_size)))
 +        return AVERROR(ENOMEM);
 +    return 0;
 +}
 +
 +static av_cold void xml_uninit(WriterContext *wctx)
 +{
 +    XMLContext *xml = wctx->priv;
 +    av_freep(&xml->buf);
 +}
 +
 +static const char *xml_escape_str(char **dst, size_t *dst_size, const char *src,
 +                                  void *log_ctx)
 +{
 +    const char *p;
 +    char *q;
 +    size_t size = 1;
 +
 +    /* precompute size */
 +    for (p = src; *p; p++, size++) {
 +        ESCAPE_CHECK_SIZE(src, size, SIZE_MAX-10);
 +        switch (*p) {
 +        case '&' : size += strlen("&amp;");  break;
 +        case '<' : size += strlen("&lt;");   break;
 +        case '>' : size += strlen("&gt;");   break;
 +        case '\"': size += strlen("&quot;"); break;
 +        case '\'': size += strlen("&apos;"); break;
 +        default: size++;
 +        }
 +    }
 +    ESCAPE_REALLOC_BUF(dst_size, dst, src, size);
 +
 +#define COPY_STR(str) {      \
 +        const char *s = str; \
 +        while (*s)           \
 +            *q++ = *s++;     \
 +    }
 +
 +    p = src;
 +    q = *dst;
 +    while (*p) {
 +        switch (*p) {
 +        case '&' : COPY_STR("&amp;");  break;
 +        case '<' : COPY_STR("&lt;");   break;
 +        case '>' : COPY_STR("&gt;");   break;
 +        case '\"': COPY_STR("&quot;"); break;
 +        case '\'': COPY_STR("&apos;"); break;
 +        default: *q++ = *p;
 +        }
 +        p++;
 +    }
 +    *q = 0;
 +
 +    return *dst;
 +}
 +
 +static void xml_print_header(WriterContext *wctx)
 +{
 +    XMLContext *xml = wctx->priv;
 +    const char *qual = " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' "
 +        "xmlns:ffprobe='http://www.ffmpeg.org/schema/ffprobe' "
 +        "xsi:schemaLocation='http://www.ffmpeg.org/schema/ffprobe ffprobe.xsd'";
 +
 +    printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 +    printf("<%sffprobe%s>\n",
 +           xml->fully_qualified ? "ffprobe:" : "",
 +           xml->fully_qualified ? qual : "");
 +
 +    xml->indent_level++;
 +}
 +
 +static void xml_print_footer(WriterContext *wctx)
 +{
 +    XMLContext *xml = wctx->priv;
 +
 +    xml->indent_level--;
 +    printf("</%sffprobe>\n", xml->fully_qualified ? "ffprobe:" : "");
 +}
 +
 +#define XML_INDENT() printf("%*c", xml->indent_level * 4, ' ')
 +
 +static void xml_print_chapter_header(WriterContext *wctx, const char *chapter)
 +{
 +    XMLContext *xml = wctx->priv;
 +
 +    if (wctx->nb_chapter)
 +        printf("\n");
 +    xml->multiple_entries = !strcmp(chapter, "packets") || !strcmp(chapter, "frames") ||
 +                            !strcmp(chapter, "packets_and_frames") ||
 +                            !strcmp(chapter, "streams") || !strcmp(chapter, "library_versions");
 +
 +    if (xml->multiple_entries) {
 +        XML_INDENT(); printf("<%s>\n", chapter);
 +        xml->indent_level++;
 +    }
 +}
 +
 +static void xml_print_chapter_footer(WriterContext *wctx, const char *chapter)
 +{
 +    XMLContext *xml = wctx->priv;
 +
 +    if (xml->multiple_entries) {
 +        xml->indent_level--;
 +        XML_INDENT(); printf("</%s>\n", chapter);
 +    }
 +}
 +
 +static void xml_print_section_header(WriterContext *wctx, const char *section)
 +{
 +    XMLContext *xml = wctx->priv;
 +
 +    XML_INDENT(); printf("<%s ", section);
 +    xml->within_tag = 1;
 +}
 +
 +static void xml_print_section_footer(WriterContext *wctx, const char *section)
 +{
 +    XMLContext *xml = wctx->priv;
 +
 +    if (xml->within_tag)
 +        printf("/>\n");
 +    else {
 +        XML_INDENT(); printf("</%s>\n", section);
 +    }
 +}
 +
 +static void xml_print_str(WriterContext *wctx, const char *key, const char *value)
 +{
 +    XMLContext *xml = wctx->priv;
 +
 +    if (wctx->nb_item)
 +        printf(" ");
 +    printf("%s=\"%s\"", key, xml_escape_str(&xml->buf, &xml->buf_size, value, wctx));
 +}
 +
 +static void xml_print_int(WriterContext *wctx, const char *key, long long int value)
 +{
 +    if (wctx->nb_item)
 +        printf(" ");
 +    printf("%s=\"%lld\"", key, value);
 +}
 +
 +static void xml_show_tags(WriterContext *wctx, AVDictionary *dict)
 +{
 +    XMLContext *xml = wctx->priv;
 +    AVDictionaryEntry *tag = NULL;
 +    int is_first = 1;
 +
 +    xml->indent_level++;
 +    while ((tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX))) {
 +        if (is_first) {
 +            /* close section tag */
 +            printf(">\n");
 +            xml->within_tag = 0;
 +            is_first = 0;
 +        }
 +        XML_INDENT();
 +        printf("<tag key=\"%s\"",
 +               xml_escape_str(&xml->buf, &xml->buf_size, tag->key,   wctx));
 +        printf(" value=\"%s\"/>\n",
 +               xml_escape_str(&xml->buf, &xml->buf_size, tag->value, wctx));
 +    }
 +    xml->indent_level--;
 +}
 +
 +static Writer xml_writer = {
 +    .name                 = "xml",
 +    .priv_size            = sizeof(XMLContext),
 +    .init                 = xml_init,
 +    .uninit               = xml_uninit,
 +    .print_header         = xml_print_header,
 +    .print_footer         = xml_print_footer,
 +    .print_chapter_header = xml_print_chapter_header,
 +    .print_chapter_footer = xml_print_chapter_footer,
 +    .print_section_header = xml_print_section_header,
 +    .print_section_footer = xml_print_section_footer,
 +    .print_integer        = xml_print_int,
 +    .print_string         = xml_print_str,
 +    .show_tags            = xml_show_tags,
 +    .flags = WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER,
 +};
 +
 +static void writer_register_all(void)
 +{
 +    static int initialized;
 +
 +    if (initialized)
 +        return;
 +    initialized = 1;
 +
 +    writer_register(&default_writer);
 +    writer_register(&compact_writer);
 +    writer_register(&csv_writer);
 +    writer_register(&json_writer);
 +    writer_register(&xml_writer);
 +}
 +
 +#define print_fmt(k, f, ...) do {              \
 +    if (fast_asprintf(&pbuf, f, __VA_ARGS__))  \
 +        writer_print_string(w, k, pbuf.s, 0);  \
 +} while (0)
 +
 +#define print_fmt_opt(k, f, ...) do {          \
 +    if (fast_asprintf(&pbuf, f, __VA_ARGS__))  \
 +        writer_print_string(w, k, pbuf.s, 1);  \
 +} while (0)
 +
 +#define print_int(k, v)         writer_print_integer(w, k, v)
 +#define print_str(k, v)         writer_print_string(w, k, v, 0)
 +#define print_str_opt(k, v)     writer_print_string(w, k, v, 1)
 +#define print_time(k, v, tb)    writer_print_time(w, k, v, tb)
 +#define print_ts(k, v)          writer_print_ts(w, k, v)
 +#define print_val(k, v, u)      writer_print_string(w, k, \
 +    value_string(val_str, sizeof(val_str), (struct unit_value){.val.i = v, .unit=u}), 0)
 +#define print_section_header(s) writer_print_section_header(w, s)
 +#define print_section_footer(s) writer_print_section_footer(w, s)
 +#define show_tags(metadata)     writer_show_tags(w, metadata)
 +
 +static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pkt, int packet_idx)
 +{
 +    char val_str[128];
 +    AVStream *st = fmt_ctx->streams[pkt->stream_index];
 +    struct print_buf pbuf = {.s = NULL};
 +    const char *s;
 +
 +    print_section_header("packet");
 +    s = av_get_media_type_string(st->codec->codec_type);
 +    if (s) print_str    ("codec_type", s);
 +    else   print_str_opt("codec_type", "unknown");
 +    print_int("stream_index",     pkt->stream_index);
 +    print_ts  ("pts",             pkt->pts);
 +    print_time("pts_time",        pkt->pts, &st->time_base);
 +    print_ts  ("dts",             pkt->dts);
 +    print_time("dts_time",        pkt->dts, &st->time_base);
 +    print_ts  ("duration",        pkt->duration);
 +    print_time("duration_time",   pkt->duration, &st->time_base);
 +    print_val("size",             pkt->size, unit_byte_str);
 +    if (pkt->pos != -1) print_fmt    ("pos", "%"PRId64, pkt->pos);
 +    else                print_str_opt("pos", "N/A");
 +    print_fmt("flags", "%c",      pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
 +    print_section_footer("packet");
 +
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream)
 +{
 +    struct print_buf pbuf = {.s = NULL};
 +    const char *s;
 +
 +    print_section_header("frame");
 +
 +    s = av_get_media_type_string(stream->codec->codec_type);
 +    if (s) print_str    ("media_type", s);
 +    else   print_str_opt("media_type", "unknown");
 +    print_int("key_frame",              frame->key_frame);
 +    print_ts  ("pkt_pts",               frame->pkt_pts);
 +    print_time("pkt_pts_time",          frame->pkt_pts, &stream->time_base);
 +    print_ts  ("pkt_dts",               frame->pkt_dts);
 +    print_time("pkt_dts_time",          frame->pkt_dts, &stream->time_base);
 +    if (frame->pkt_pos != -1) print_fmt    ("pkt_pos", "%"PRId64, frame->pkt_pos);
 +    else                      print_str_opt("pkt_pos", "N/A");
 +
 +    switch (stream->codec->codec_type) {
 +    case AVMEDIA_TYPE_VIDEO:
 +        print_int("width",                  frame->width);
 +        print_int("height",                 frame->height);
 +        s = av_get_pix_fmt_name(frame->format);
 +        if (s) print_str    ("pix_fmt", s);
 +        else   print_str_opt("pix_fmt", "unknown");
 +        if (frame->sample_aspect_ratio.num) {
 +            print_fmt("sample_aspect_ratio", "%d:%d",
 +                      frame->sample_aspect_ratio.num,
 +                      frame->sample_aspect_ratio.den);
 +        } else {
 +            print_str_opt("sample_aspect_ratio", "N/A");
 +        }
 +        print_fmt("pict_type",              "%c", av_get_picture_type_char(frame->pict_type));
 +        print_int("coded_picture_number",   frame->coded_picture_number);
 +        print_int("display_picture_number", frame->display_picture_number);
 +        print_int("interlaced_frame",       frame->interlaced_frame);
 +        print_int("top_field_first",        frame->top_field_first);
 +        print_int("repeat_pict",            frame->repeat_pict);
 +        print_int("reference",              frame->reference);
 +        break;
 +
 +    case AVMEDIA_TYPE_AUDIO:
 +        s = av_get_sample_fmt_name(frame->format);
 +        if (s) print_str    ("sample_fmt", s);
 +        else   print_str_opt("sample_fmt", "unknown");
 +        print_int("nb_samples",         frame->nb_samples);
 +        break;
 +    }
 +
 +    print_section_footer("frame");
 +
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static av_always_inline int get_decoded_frame(AVFormatContext *fmt_ctx,
 +                                              AVFrame *frame, int *got_frame,
 +                                              AVPacket *pkt)
 +{
 +    AVCodecContext *dec_ctx = fmt_ctx->streams[pkt->stream_index]->codec;
 +    int ret = 0;
 +
 +    *got_frame = 0;
 +    switch (dec_ctx->codec_type) {
 +    case AVMEDIA_TYPE_VIDEO:
 +        ret = avcodec_decode_video2(dec_ctx, frame, got_frame, pkt);
 +        break;
 +
 +    case AVMEDIA_TYPE_AUDIO:
 +        ret = avcodec_decode_audio4(dec_ctx, frame, got_frame, pkt);
 +        break;
 +    }
 +
 +    return ret;
 +}
 +
 +static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx)
 +{
 +    AVPacket pkt, pkt1;
 +    AVFrame frame;
 +    int i = 0, ret, got_frame;
 +
 +    av_init_packet(&pkt);
 +
 +    while (!av_read_frame(fmt_ctx, &pkt)) {
 +        if (do_show_packets)
 +            show_packet(w, fmt_ctx, &pkt, i++);
 +        if (do_show_frames) {
 +            pkt1 = pkt;
 +            while (1) {
 +                avcodec_get_frame_defaults(&frame);
 +                ret = get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt1);
 +                if (ret < 0 || !got_frame)
 +                    break;
 +                show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]);
 +                pkt1.data += ret;
 +                pkt1.size -= ret;
 +            }
 +        }
 +        av_free_packet(&pkt);
 +    }
 +    av_init_packet(&pkt);
 +    pkt.data = NULL;
 +    pkt.size = 0;
 +    //Flush remaining frames that are cached in the decoder
 +    for (i = 0; i < fmt_ctx->nb_streams; i++) {
 +        pkt.stream_index = i;
 +        while (get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt) >= 0 && got_frame)
 +            show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]);
 +    }
 +}
 +
 +static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx)
 +{
 +    AVStream *stream = fmt_ctx->streams[stream_idx];
 +    AVCodecContext *dec_ctx;
 +    AVCodec *dec;
 +    char val_str[128];
 +    const char *s;
 +    AVRational display_aspect_ratio;
 +    struct print_buf pbuf = {.s = NULL};
 +
 +    print_section_header("stream");
 +
 +    print_int("index", stream->index);
 +
 +    if ((dec_ctx = stream->codec)) {
 +        if ((dec = dec_ctx->codec)) {
 +            print_str("codec_name",      dec->name);
 +            print_str("codec_long_name", dec->long_name);
 +        } else {
 +            print_str_opt("codec_name",      "unknown");
 +            print_str_opt("codec_long_name", "unknown");
 +        }
 +
 +        s = av_get_media_type_string(dec_ctx->codec_type);
 +        if (s) print_str    ("codec_type", s);
 +        else   print_str_opt("codec_type", "unknown");
 +        print_fmt("codec_time_base", "%d/%d", dec_ctx->time_base.num, dec_ctx->time_base.den);
 +
 +        /* print AVI/FourCC tag */
 +        av_get_codec_tag_string(val_str, sizeof(val_str), dec_ctx->codec_tag);
 +        print_str("codec_tag_string",    val_str);
 +        print_fmt("codec_tag", "0x%04x", dec_ctx->codec_tag);
 +
 +        switch (dec_ctx->codec_type) {
 +        case AVMEDIA_TYPE_VIDEO:
 +            print_int("width",        dec_ctx->width);
 +            print_int("height",       dec_ctx->height);
 +            print_int("has_b_frames", dec_ctx->has_b_frames);
 +            if (dec_ctx->sample_aspect_ratio.num) {
 +                print_fmt("sample_aspect_ratio", "%d:%d",
 +                          dec_ctx->sample_aspect_ratio.num,
 +                          dec_ctx->sample_aspect_ratio.den);
 +                av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
 +                          dec_ctx->width  * dec_ctx->sample_aspect_ratio.num,
 +                          dec_ctx->height * dec_ctx->sample_aspect_ratio.den,
 +                          1024*1024);
 +                print_fmt("display_aspect_ratio", "%d:%d",
 +                          display_aspect_ratio.num,
 +                          display_aspect_ratio.den);
 +            } else {
 +                print_str_opt("sample_aspect_ratio", "N/A");
 +                print_str_opt("display_aspect_ratio", "N/A");
 +            }
 +            s = av_get_pix_fmt_name(dec_ctx->pix_fmt);
 +            if (s) print_str    ("pix_fmt", s);
 +            else   print_str_opt("pix_fmt", "unknown");
 +            print_int("level",   dec_ctx->level);
 +            if (dec_ctx->timecode_frame_start >= 0) {
 +                uint32_t tc = dec_ctx->timecode_frame_start;
 +                print_fmt("timecode", "%02d:%02d:%02d%c%02d",
 +                          tc>>19 & 0x1f,              // hours
 +                          tc>>13 & 0x3f,              // minutes
 +                          tc>>6  & 0x3f,              // seconds
 +                          tc     & 1<<24 ? ';' : ':', // drop
 +                          tc     & 0x3f);             // frames
 +            } else {
 +                print_str_opt("timecode", "N/A");
 +            }
 +            break;
 +
 +        case AVMEDIA_TYPE_AUDIO:
 +            s = av_get_sample_fmt_name(dec_ctx->sample_fmt);
 +            if (s) print_str    ("sample_fmt", s);
 +            else   print_str_opt("sample_fmt", "unknown");
 +            print_val("sample_rate",     dec_ctx->sample_rate, unit_hertz_str);
 +            print_int("channels",        dec_ctx->channels);
 +            print_int("bits_per_sample", av_get_bits_per_sample(dec_ctx->codec_id));
 +            break;
 +        }
 +    } else {
 +        print_str_opt("codec_type", "unknown");
 +    }
 +    if (dec_ctx->codec && dec_ctx->codec->priv_class && show_private_data) {
 +        const AVOption *opt = NULL;
 +        while (opt = av_opt_next(dec_ctx->priv_data,opt)) {
 +            uint8_t *str;
 +            if (opt->flags) continue;
 +            if (av_opt_get(dec_ctx->priv_data, opt->name, 0, &str) >= 0) {
 +                print_str(opt->name, str);
 +                av_free(str);
 +            }
 +        }
 +    }
 +
 +    if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS) print_fmt    ("id", "0x%x", stream->id);
 +    else                                          print_str_opt("id", "N/A");
 +    print_fmt("r_frame_rate",   "%d/%d", stream->r_frame_rate.num,   stream->r_frame_rate.den);
 +    print_fmt("avg_frame_rate", "%d/%d", stream->avg_frame_rate.num, stream->avg_frame_rate.den);
 +    print_fmt("time_base",      "%d/%d", stream->time_base.num,      stream->time_base.den);
 +    print_time("start_time",    stream->start_time, &stream->time_base);
 +    print_time("duration",      stream->duration,   &stream->time_base);
 +    if (stream->nb_frames) print_fmt    ("nb_frames", "%"PRId64, stream->nb_frames);
 +    else                   print_str_opt("nb_frames", "N/A");
 +    show_tags(stream->metadata);
 +
 +    print_section_footer("stream");
 +    av_free(pbuf.s);
 +    fflush(stdout);
 +}
 +
 +static void show_streams(WriterContext *w, AVFormatContext *fmt_ctx)
 +{
 +    int i;
 +    for (i = 0; i < fmt_ctx->nb_streams; i++)
 +        show_stream(w, fmt_ctx, i);
 +}
 +
 +static void show_format(WriterContext *w, AVFormatContext *fmt_ctx)
 +{
 +    char val_str[128];
++    int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1;
 +
 +    print_section_header("format");
 +    print_str("filename",         fmt_ctx->filename);
 +    print_int("nb_streams",       fmt_ctx->nb_streams);
 +    print_str("format_name",      fmt_ctx->iformat->name);
 +    print_str("format_long_name", fmt_ctx->iformat->long_name);
 +    print_time("start_time",      fmt_ctx->start_time, &AV_TIME_BASE_Q);
 +    print_time("duration",        fmt_ctx->duration,   &AV_TIME_BASE_Q);
 +    if (size >= 0) print_val    ("size", size, unit_byte_str);
 +    else           print_str_opt("size", "N/A");
 +    if (fmt_ctx->bit_rate > 0) print_val    ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str);
 +    else                       print_str_opt("bit_rate", "N/A");
 +    show_tags(fmt_ctx->metadata);
 +    print_section_footer("format");
 +    fflush(stdout);
 +}
 +
 +static void show_error(WriterContext *w, int err)
 +{
 +    char errbuf[128];
 +    const char *errbuf_ptr = errbuf;
 +
 +    if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
 +        errbuf_ptr = strerror(AVUNERROR(err));
 +
 +    writer_print_chapter_header(w, "error");
 +    print_section_header("error");
 +    print_int("code", err);
 +    print_str("string", errbuf_ptr);
 +    print_section_footer("error");
 +    writer_print_chapter_footer(w, "error");
 +}
 +
 +static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
 +{
 +    int err, i;
 +    AVFormatContext *fmt_ctx = NULL;
 +    AVDictionaryEntry *t;
 +
 +    if ((err = avformat_open_input(&fmt_ctx, filename, iformat, &format_opts)) < 0) {
 +        print_error(filename, err);
 +        return err;
 +    }
 +    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
 +        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
 +        return AVERROR_OPTION_NOT_FOUND;
 +    }
 +
 +
 +    /* fill the streams in the format context */
 +    if ((err = avformat_find_stream_info(fmt_ctx, NULL)) < 0) {
 +        print_error(filename, err);
 +        return err;
 +    }
 +
 +    av_dump_format(fmt_ctx, 0, filename, 0);
 +
 +    /* bind a decoder to each input stream */
 +    for (i = 0; i < fmt_ctx->nb_streams; i++) {
 +        AVStream *stream = fmt_ctx->streams[i];
 +        AVCodec *codec;
 +
 +        if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) {
 +            av_log(NULL, AV_LOG_ERROR, "Unsupported codec with id %d for input stream %d\n",
 +                   stream->codec->codec_id, stream->index);
 +        } else if (avcodec_open2(stream->codec, codec, NULL) < 0) {
 +            av_log(NULL, AV_LOG_ERROR, "Error while opening codec for input stream %d\n",
 +                   stream->index);
 +        }
 +    }
 +
 +    *fmt_ctx_ptr = fmt_ctx;
 +    return 0;
 +}
 +
 +#define PRINT_CHAPTER(name) do {                                        \
 +    if (do_show_ ## name) {                                             \
 +        writer_print_chapter_header(wctx, #name);                       \
 +        show_ ## name (wctx, fmt_ctx);                                  \
 +        writer_print_chapter_footer(wctx, #name);                       \
 +    }                                                                   \
 +} while (0)
 +
 +static int probe_file(WriterContext *wctx, const char *filename)
 +{
 +    AVFormatContext *fmt_ctx;
 +    int ret, i;
 +
 +    ret = open_input_file(&fmt_ctx, filename);
 +    if (ret >= 0) {
 +        if (do_show_packets || do_show_frames) {
 +            const char *chapter;
 +            if (do_show_frames && do_show_packets &&
 +                wctx->writer->flags & WRITER_FLAG_PUT_PACKETS_AND_FRAMES_IN_SAME_CHAPTER)
 +                chapter = "packets_and_frames";
 +            else if (do_show_packets && !do_show_frames)
 +                chapter = "packets";
 +            else // (!do_show_packets && do_show_frames)
 +                chapter = "frames";
 +            writer_print_chapter_header(wctx, chapter);
 +            show_packets(wctx, fmt_ctx);
 +            writer_print_chapter_footer(wctx, chapter);
 +        }
 +        PRINT_CHAPTER(streams);
 +        PRINT_CHAPTER(format);
 +        for (i = 0; i < fmt_ctx->nb_streams; i++)
 +            if (fmt_ctx->streams[i]->codec->codec_id != CODEC_ID_NONE)
 +                avcodec_close(fmt_ctx->streams[i]->codec);
 +        avformat_close_input(&fmt_ctx);
 +    }
 +
 +    return ret;
 +}
 +
 +static void show_usage(void)
 +{
 +    av_log(NULL, AV_LOG_INFO, "Simple multimedia streams analyzer\n");
 +    av_log(NULL, AV_LOG_INFO, "usage: %s [OPTIONS] [INPUT_FILE]\n", program_name);
 +    av_log(NULL, AV_LOG_INFO, "\n");
 +}
 +
 +static void ffprobe_show_program_version(WriterContext *w)
 +{
 +    struct print_buf pbuf = {.s = NULL};
 +
 +    writer_print_chapter_header(w, "program_version");
 +    print_section_header("program_version");
 +    print_str("version", FFMPEG_VERSION);
 +    print_fmt("copyright", "Copyright (c) %d-%d the FFmpeg developers",
 +              program_birth_year, this_year);
 +    print_str("build_date", __DATE__);
 +    print_str("build_time", __TIME__);
 +    print_str("compiler_type", CC_TYPE);
 +    print_str("compiler_version", CC_VERSION);
 +    print_str("configuration", FFMPEG_CONFIGURATION);
 +    print_section_footer("program_version");
 +    writer_print_chapter_footer(w, "program_version");
 +
 +    av_free(pbuf.s);
 +}
 +
 +#define SHOW_LIB_VERSION(libname, LIBNAME)                              \
 +    do {                                                                \
 +        if (CONFIG_##LIBNAME) {                                         \
 +            unsigned int version = libname##_version();                 \
 +            print_section_header("library_version");                    \
 +            print_str("name",    "lib" #libname);                       \
 +            print_int("major",   LIB##LIBNAME##_VERSION_MAJOR);         \
 +            print_int("minor",   LIB##LIBNAME##_VERSION_MINOR);         \
 +            print_int("micro",   LIB##LIBNAME##_VERSION_MICRO);         \
 +            print_int("version", version);                              \
 +            print_section_footer("library_version");                    \
 +        }                                                               \
 +    } while (0)
 +
 +static void ffprobe_show_library_versions(WriterContext *w)
 +{
 +    writer_print_chapter_header(w, "library_versions");
 +    SHOW_LIB_VERSION(avutil,     AVUTIL);
 +    SHOW_LIB_VERSION(avcodec,    AVCODEC);
 +    SHOW_LIB_VERSION(avformat,   AVFORMAT);
 +    SHOW_LIB_VERSION(avdevice,   AVDEVICE);
 +    SHOW_LIB_VERSION(avfilter,   AVFILTER);
 +    SHOW_LIB_VERSION(swscale,    SWSCALE);
 +    SHOW_LIB_VERSION(swresample, SWRESAMPLE);
 +    SHOW_LIB_VERSION(postproc,   POSTPROC);
 +    writer_print_chapter_footer(w, "library_versions");
 +}
 +
 +static int opt_format(const char *opt, const char *arg)
 +{
 +    iformat = av_find_input_format(arg);
 +    if (!iformat) {
 +        av_log(NULL, AV_LOG_ERROR, "Unknown input format: %s\n", arg);
 +        return AVERROR(EINVAL);
 +    }
 +    return 0;
 +}
 +
 +static void opt_input_file(void *optctx, const char *arg)
 +{
 +    if (input_filename) {
 +        av_log(NULL, AV_LOG_ERROR, "Argument '%s' provided as input filename, but '%s' was already specified.\n",
 +               arg, input_filename);
 +        exit(1);
 +    }
 +    if (!strcmp(arg, "-"))
 +        arg = "pipe:";
 +    input_filename = arg;
 +}
 +
 +static int opt_help(const char *opt, const char *arg)
 +{
 +    av_log_set_callback(log_callback_help);
 +    show_usage();
 +    show_help_options(options, "Main options:\n", 0, 0);
 +    printf("\n");
 +
 +    show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
 +
 +    return 0;
 +}
 +
 +static int opt_pretty(const char *opt, const char *arg)
 +{
 +    show_value_unit              = 1;
 +    use_value_prefix             = 1;
 +    use_byte_value_binary_prefix = 1;
 +    use_value_sexagesimal_format = 1;
 +    return 0;
 +}
 +
 +static int opt_show_versions(const char *opt, const char *arg)
 +{
 +    do_show_program_version  = 1;
 +    do_show_library_versions = 1;
 +    return 0;
 +}
 +
 +static const OptionDef options[] = {
 +#include "cmdutils_common_opts.h"
 +    { "f", HAS_ARG, {(void*)opt_format}, "force format", "format" },
 +    { "unit", OPT_BOOL, {(void*)&show_value_unit}, "show unit of the displayed values" },
 +    { "prefix", OPT_BOOL, {(void*)&use_value_prefix}, "use SI prefixes for the displayed values" },
 +    { "byte_binary_prefix", OPT_BOOL, {(void*)&use_byte_value_binary_prefix},
 +      "use binary prefixes for byte units" },
 +    { "sexagesimal", OPT_BOOL,  {(void*)&use_value_sexagesimal_format},
 +      "use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units" },
 +    { "pretty", 0, {(void*)&opt_pretty},
 +      "prettify the format of displayed values, make it more human readable" },
 +    { "print_format", OPT_STRING | HAS_ARG, {(void*)&print_format},
 +      "set the output printing format (available formats are: default, compact, csv, json, xml)", "format" },
 +    { "show_error",   OPT_BOOL, {(void*)&do_show_error} ,  "show probing error" },
 +    { "show_format",  OPT_BOOL, {(void*)&do_show_format} , "show format/container info" },
 +    { "show_frames",  OPT_BOOL, {(void*)&do_show_frames} , "show frames info" },
 +    { "show_packets", OPT_BOOL, {(void*)&do_show_packets}, "show packets info" },
 +    { "show_streams", OPT_BOOL, {(void*)&do_show_streams}, "show streams info" },
 +    { "show_program_version",  OPT_BOOL, {(void*)&do_show_program_version},  "show ffprobe version" },
 +    { "show_library_versions", OPT_BOOL, {(void*)&do_show_library_versions}, "show library versions" },
 +    { "show_versions",         0, {(void*)&opt_show_versions}, "show program and library versions" },
 +    { "show_private_data", OPT_BOOL, {(void*)&show_private_data}, "show private data" },
 +    { "private",           OPT_BOOL, {(void*)&show_private_data}, "same as show_private_data" },
 +    { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
 +    { "i", HAS_ARG, {(void *)opt_input_file}, "read specified file", "input_file"},
 +    { NULL, },
 +};
 +
 +int main(int argc, char **argv)
 +{
 +    const Writer *w;
 +    WriterContext *wctx;
 +    char *buf;
 +    char *w_name = NULL, *w_args = NULL;
 +    int ret;
 +
 +    av_log_set_flags(AV_LOG_SKIP_REPEATED);
 +    parse_loglevel(argc, argv, options);
 +    av_register_all();
 +    avformat_network_init();
 +    init_opts();
 +#if CONFIG_AVDEVICE
 +    avdevice_register_all();
 +#endif
 +
 +    show_banner(argc, argv, options);
 +    parse_options(NULL, argc, argv, options, opt_input_file);
 +
 +    writer_register_all();
 +
 +    if (!print_format)
 +        print_format = av_strdup("default");
 +    w_name = av_strtok(print_format, "=", &buf);
 +    w_args = buf;
 +
 +    w = writer_get_by_name(w_name);
 +    if (!w) {
 +        av_log(NULL, AV_LOG_ERROR, "Unknown output format with name '%s'\n", w_name);
 +        ret = AVERROR(EINVAL);
 +        goto end;
 +    }
 +
 +    if ((ret = writer_open(&wctx, w, w_args, NULL)) >= 0) {
 +        writer_print_header(wctx);
 +
 +        if (do_show_program_version)
 +            ffprobe_show_program_version(wctx);
 +        if (do_show_library_versions)
 +            ffprobe_show_library_versions(wctx);
 +
 +        if (!input_filename &&
 +            ((do_show_format || do_show_streams || do_show_packets || do_show_error) ||
 +             (!do_show_program_version && !do_show_library_versions))) {
 +            show_usage();
 +            av_log(NULL, AV_LOG_ERROR, "You have to specify one input file.\n");
 +            av_log(NULL, AV_LOG_ERROR, "Use -h to get full help or, even better, run 'man %s'.\n", program_name);
 +            ret = AVERROR(EINVAL);
 +        } else if (input_filename) {
 +            ret = probe_file(wctx, input_filename);
 +            if (ret < 0 && do_show_error)
 +                show_error(wctx, ret);
 +        }
 +
 +        writer_print_footer(wctx);
 +        writer_close(&wctx);
 +    }
 +
 +end:
 +    av_freep(&print_format);
 +    avformat_network_deinit();
 +
 +    return ret;
 +}
diff --cc ffserver.c
Simple merge
Simple merge
Simple merge
index a02dd7bdb4f25dba1c4a7e06f8273554ccc7f086,08484a7a9c687dcf3280a77bf17594de2ce041cd..ab611baea1981e2aca36115ced3729a5815ca258
@@@ -493,15 -492,17 +493,18 @@@ av_cold int MPV_encode_init(AVCodecCont
           s->codec_id == CODEC_ID_H263P) &&
          (avctx->sample_aspect_ratio.num > 255 ||
           avctx->sample_aspect_ratio.den > 255)) {
 -        av_log(avctx, AV_LOG_ERROR,
 -               "Invalid pixel aspect ratio %i/%i, limit is 255/255\n",
 +        av_log(avctx, AV_LOG_WARNING,
 +               "Invalid pixel aspect ratio %i/%i, limit is 255/255 reducing\n",
                 avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);
 -        return -1;
 +        av_reduce(&avctx->sample_aspect_ratio.num, &avctx->sample_aspect_ratio.den,
 +                   avctx->sample_aspect_ratio.num,  avctx->sample_aspect_ratio.den, 255);
      }
  
-     if ((s->flags & (CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME |
-                      CODEC_FLAG_ALT_SCAN)) &&
+     if ((s->flags & (CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME
+ #if FF_API_MPEGVIDEO_GLOBAL_OPTS
+                     | CODEC_FLAG_ALT_SCAN
+ #endif
+         )) &&
          s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO) {
          av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
          return -1;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d4b71d27c03b6d4c3e67b1c5867e5fb3ff54800f,09865c148d21c822e9e9985ed72c5ce69240306e..d21d5f4230e2062c4944aa3cf37b6281876631e2
@@@ -1,16 -1,9 +1,16 @@@
 +include $(SUBDIR)../config.mak
 +
  NAME = avfilter
  FFLIBS = avutil
 +
 +FFLIBS-$(CONFIG_ACONVERT_FILTER) += avcodec
 +FFLIBS-$(CONFIG_AMOVIE_FILTER) += avformat avcodec
 +FFLIBS-$(CONFIG_ARESAMPLE_FILTER) += avcodec
  FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
  FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
 +FFLIBS-$(CONFIG_MP_FILTER) += avcodec
  
- HEADERS = avcodec.h avfilter.h avfiltergraph.h buffersink.h vsrc_buffer.h
 -HEADERS = avfilter.h avfiltergraph.h buffersrc.h version.h vsrc_buffer.h
++HEADERS = avcodec.h avfilter.h avfiltergraph.h buffersink.h version.h vsrc_buffer.h
  
  OBJS = allfilters.o                                                     \
         avfilter.o                                                       \
index 1746907273c53b8ed9489ad6d89b4073e490eebd,068c50bb487e56948275c2d8c32176d27ee86986..9c7a2e5bbf16177d35dc5b99c9e94ac7610a2168
  #include "libavutil/rational.h"
  #include "libavcodec/avcodec.h"
  
- #define LIBAVFILTER_VERSION_MAJOR  2
- #define LIBAVFILTER_VERSION_MINOR 58
- #define LIBAVFILTER_VERSION_MICRO 101
- #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
-                                                LIBAVFILTER_VERSION_MINOR, \
-                                                LIBAVFILTER_VERSION_MICRO)
- #define LIBAVFILTER_VERSION     AV_VERSION(LIBAVFILTER_VERSION_MAJOR,   \
-                                            LIBAVFILTER_VERSION_MINOR,   \
-                                            LIBAVFILTER_VERSION_MICRO)
- #define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
 +
 +#ifndef FF_API_OLD_VSINK_API
 +#define FF_API_OLD_VSINK_API        (LIBAVFILTER_VERSION_MAJOR < 3)
 +#endif
 +#ifndef FF_API_OLD_ALL_FORMATS_API
 +#define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3)
 +#endif
 +
  #include <stddef.h>
  
+ #include "libavfilter/version.h"
  /**
   * Return the LIBAVFILTER_VERSION_INT constant.
   */
index 0000000000000000000000000000000000000000,09d6700d1285573ad25937508824ac278b674b0c..0eb5f7e70a8cdf99ed1ae2fa86cfaa7dd2085732
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,43 +1,43 @@@
 -#define LIBAVFILTER_VERSION_MINOR  15
 -#define LIBAVFILTER_VERSION_MICRO  0
+ /*
+  * Version macros.
+  *
+  * This file is part of Libav.
+  *
+  * Libav is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
+  * Libav is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with Libav; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ #ifndef AVFILTER_VERSION_H
+ #define AVFILTER_VERSION_H
+ /**
+  * @file
+  * Libavfilter version macros
+  */
+ #include "libavutil/avutil.h"
+ #define LIBAVFILTER_VERSION_MAJOR  2
++#define LIBAVFILTER_VERSION_MINOR 59
++#define LIBAVFILTER_VERSION_MICRO 100
+ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
+                                                LIBAVFILTER_VERSION_MINOR, \
+                                                LIBAVFILTER_VERSION_MICRO)
+ #define LIBAVFILTER_VERSION     AV_VERSION(LIBAVFILTER_VERSION_MAJOR,   \
+                                            LIBAVFILTER_VERSION_MINOR,   \
+                                            LIBAVFILTER_VERSION_MICRO)
+ #define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
+ #endif // AVFILTER_VERSION_H
index 362449342e66b3953eb2b283ded24f52910de87b,e5b96a60cf8d34e86caefa87c1c074fbd7f1b05c..743698eff952752f07469dc5ac00da12fc71cfaf
@@@ -182,6 -114,14 +182,14 @@@ static av_cold int init(AVFilterContex
      return 0;
  }
  
 -    if (s->buf)
 -        avfilter_unref_buffer(s->buf);
 -    s->buf = NULL;
+ static av_cold void uninit(AVFilterContext *ctx)
+ {
+     BufferSourceContext *s = ctx->priv;
++    if (s->picref)
++        avfilter_unref_buffer(s->picref);
++    s->picref = NULL;
+ }
  static int query_formats(AVFilterContext *ctx)
  {
      BufferSourceContext *c = ctx->priv;
@@@ -235,9 -175,10 +243,10 @@@ AVFilter avfilter_vsrc_buffer = 
      .query_formats = query_formats,
  
      .init      = init,
+     .uninit    = uninit,
  
 -    .inputs    = (AVFilterPad[]) {{ .name = NULL }},
 -    .outputs   = (AVFilterPad[]) {{ .name            = "default",
 +    .inputs    = (const AVFilterPad[]) {{ .name = NULL }},
 +    .outputs   = (const AVFilterPad[]) {{ .name      = "default",
                                      .type            = AVMEDIA_TYPE_VIDEO,
                                      .request_frame   = request_frame,
                                      .poll_frame      = poll_frame,
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge