* commit '1ecdf891':
  avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

Conflicts:
	libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '63d744e2':
  av_log_missing_feature() ---> avpriv_report_missing_feature()

Conflicts:
	libavcodec/aacdec.c
	libavcodec/tta.c
	libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f099d3d1':
  Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
  ismindex: Check the return value of allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7c147900':
  ismindex: Factorize code for printing chunk duration lists
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f05e9beb':
  ismindex: Rename structs and fields from "file" to "track"
  avpacket: copy side data type and size in av_dup_packet

Conflicts:
	libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

That field is deprecated.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

This reverts commit 9efcfbed.

All the shame on me; this commit is actually causing more problems
(broken outputs but also crashes) than it was solving.

Before this change, the audio input and output formats are set
independently, so the lavfi negociation could pick different settings
for the input and output. This is particularly true for the channel
layout settings, where multiple choices were available.

Fixes Ticket2342.

This makes possible the raise of one picture if the input has less than
the number of frames to analyze.

Fixes Ticket1992.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Since the conversion to refcounted frames, the tiff decoder
only wrote the metadata into its internal "picture" in its own context,
never exposing the metadata to the user, and eventually leaking the
metadata.

Instead, properly store the metadata directly into the frame being decoded into.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Always use the special filter for the first and last 3 columns (only).

Changes made in 64ed3976 slowed the filter to just under 3/4 of what it
was.  This commit restores the speed while maintaining identical output.

For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows reporting missing features and requesting samples from
all libraries in a standard way; with a simplified API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This field was only ever set and freed from avcodec, and not otherwise
used. However, because frames are refcounted now, avcodec cannot make any
assumptions about the lifetime of the frame metadata, which can result in
double-frees or leaked memory.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

The tool nowadays supports more than one track per file,
this makes reading the code slightly less confusing.
Signed-off-by: Martin Storsjö <martin@martin.st>

Coccinelle profile used:

  @@
  expression r, ctx, f, loglevel, str, flags;
  @@

  -if ((r = ff_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_get_buffer(ctx, f, flags)) < 0)
  +    return r;

  @@
  expression r, ctx, f, loglevel, str;
  @@

  -if ((r = ff_reget_buffer(ctx, f)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_reget_buffer(ctx, f)) < 0)
  +    return r;

  @@
  expression r, ctx, f, loglevel, str, flags;
  @@

  -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0)
  +    return r;

...along with some manual patches for the remaining ones.