Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9469370f':
  h264: Use AVERROR return codes instead of -1

Only partially merged, as the first hunk is not correct and would result
in endless log spam.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e5997152':
  asf: Use time_t where needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '944f6086':
  asfdec: read values properly
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

This commit moves any tables specific to the encoder from aacenc
and aaccoder to a separate file called 'aacenctab.c/.h'.
This was done as a clean up attempt as the encoder was filled with
tables pasted in between functions which made it confusing to follow
and track where each table and definition had been used.
This commit solves this by simply exporting the smaller tables out to
the aacenctab.h while the larger ones are compiled using aacenctab.c
and are referenced from the header file.
Signed-off-by: Claudio Freire <klaussfreire@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

tests/fate/mp3: increase mp3-float-extra_overread FUZZ for ppc64be-RHEL7.0-gcc-4.8.2-ibmcrl to 23 from 20
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes potential null pointer dereference on deallocation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

At least the new videotoolbox decoder does not actually set a frame if
end_frame fails. This causes the API to return success and signals that
a picture was decoded, even though AVFrame->data[0] is NULL.

Fix this by propagating end_frame errors.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Compute individual stream durations in matroska muxer.
Write them as string tags in the same format as mkvmerge tool does.
Signed-off-by: Sasi Inguva <isasi@google.com>

The windows SDL audio driver plays the old data in the buffer in a loop if it
is not updated in time. So instead of waiting for data and blocking the the
audio thread, return silence if no data is available.

Should fix ticket #2289.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Henrik Gramner <henrik@gramner.com>

Avoid duplicating the literal numeric values
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'b197f783':
  configure: Silence error messages when probing compiler
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '98c9ade9':
  drawtext: Move the strftime expansion in a separate function

Not merged, the code does not exist anymore.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fe026ba9':
  drawtext: Drop stray guards

Conflicts:
	libavfilter/vf_drawtext.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4fee11ab':
  png: Be more informative regarding signature errors

Conflicts:
	libavcodec/pngdec.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

And report why it fails.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This corrects parsing the later elements

Fixes Ticket4754
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

gmtime takes a time_t not an uint64_t.

Thanks to WereCatf for pointing out this now exists.

Github: Closes #143

Fixes auto-detection of compressed swf files as in
http://samples.ffmpeg.org/SWF/compressed-swf/
Reported by forum user Zard1096.

The length of BOOL values is 16 bits in the Metadata Object but
32 bits in the Extended Content Description Object.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.