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>

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

* 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>

* commit '9286de04':
  mov: Double-check that alias path is not an absolute path

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

* commit '376589e5':
  mov: Read alternate absolute path in dref alis
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '22526c1f':
  Canopus HQ/HQA decoder

Conflicts:
	Changelog
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e6fb844f':
  Implement shared parsing of INFO tag in Canopus family
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fcda30f2':
  fate: Prefix cllc tests with canopus

Conflicts:
	tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b5338f6':
  hqx: Implement slice-threaded decoding

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

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

* commit '453642f8':
  hqx: Store shareable data in main decoder context

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

* commit 'ea031b75':
  hqx: Move DSP related code to a separate file

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

* commit '17aa81d9':
  hqx: Merge invalid format check within switch block

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

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

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

* commit '6a85dfc8':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
	libavcodec/aacdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/bitstream.c
	libavcodec/dcadec.c
	libavcodec/dnxhddec.c
	libavcodec/dvbsubdec.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/get_bits.h
	libavcodec/gifdec.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/imc.c
	libavcodec/interplayvideo.c
	libavcodec/jpeglsdec.c
	libavcodec/libopencore-amr.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_parser.c
	libavcodec/pngdec.c
	libavcodec/ratecontrol.c
	libavcodec/rv10.c
	libavcodec/svq1dec.c
	libavcodec/vqavideo.c
	libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1a3eb042':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c253340a':
  log: Introduce a more verbose debug level

Conflicts:
	doc/APIchanges
	doc/fftools-common-opts.texi
	libavutil/log.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Bug-Id: CID 1291564
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

ac may be NULL and then accessing ac->avctx results in a segmentation fault.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

warning: incompatible
      pointer types assigning to 'me_cmp_func' (aka 'int (*)(struct
      MpegEncContext *, uint8_t *, uint8_t *, ptrdiff_t, int)') from 'int
      (MpegEncContext *, uint8_t *, uint8_t *, int, int)'
      [-Wincompatible-pointer-types]

Fix a rather lengthy initialization warning from clang.