* commit '98cab397':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '86e1a358':
  h264_ps: Return meaningful error codes and address a memory leak

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

* commit '338ed3ed':
  ffv1: Pass correct pointers to av_free()

Conflicts:
	libavcodec/ffv1.c

See: a3963cc8Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3b1e35d4':
  fate: Omit the results if the test passed

See: 1a562adbMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd34039b1':
  rmenc: Drop the temporary buffer for ac3 byteswap
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '656e31ed':
  ogg: Forward errors further
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1834681':
  flac: fix realloc loop with invalid flac files
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2cc39365':
  dashenc: Add a publishTime field in dynamic manifests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Seeking to a negative time did not have the desired effect of seeking to
the next valid position (the file start). On the other hand, just
"-ss 0" will normally seek to a position higher than 0, because it adds
the start time of the file. (The start time is not 0 because the gapless
code skips a few samples from the start.)

Fix this by using the "-seek_timestamp 1" option, which makes "-ss 0" do
what you'd expect it would do.

Also put the -ss option at the right place, before -i. This actually
makes it seek, instead of something completely else. The ".out-3" test
is no different in the -usetoc 0/1 cases, because the seeking is
inaccurate (in both cases).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

warning: assigning to
      'char *' from 'const char *' discards qualifiers
      [-Wincompatible-pointer-types-discards-qualifiers]

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

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

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

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

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

This was av_dlog() previously and should not have been changed to av_log()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Bug-Id: CID 1026763

Bug-Id: CID 1295124

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

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Ludmila Glinskih <lglinskih@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '386e2755':
  jack: Check memory allocation

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

The FATE server does not report this information anyway and omitting
it makes the successful run send much less data.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Use direcly avio_w8().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

This field is mandatory in dynamic manifests.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '617814b4':
  buffersrc: Fix resource leak on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '336d2f09':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'eb31256f':
  g2meet: Support G2M5 codec variant

Conflicts:
	libavcodec/version.h

See: 4ba5420eMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '88d1fb4e':
  filtfmts: Avoid null pointer dereference

Conflicts:
	libavfilter/filtfmts.c

See: 24326930Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a1d58e3b':
  avutil: remove pointless bmi1 define

See: a40cee03Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '09bd7ddf':
  aacdec: consistently use avctx for logging in decode_eld_specific_config

See: 5b75689bMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3d71b1f8':
  mpegvideo_enc: Simplify picture allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0251c9be':
  motion_est: Fix warning from zero_cmp() assignment

See: ea41e6d6Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d593896':
  vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Conflicts:
	libavcodec/vc1_pred.c

See: 6c5bd7d7Merged-by: Michael Niedermayer <michaelni@gmx.at>