check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)
build: export library dependencies in ${name}_FFLIBS

Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.
lavf: add av_stream_get_side_data
ffmpeg/set_encoder_id: dont allocate encoder string if one is already set

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec: remove no longer needed ff_codec_close_recursive()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/smvjpegdec: Dont ignore avcodec_close() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mux: Remove localized encoder strings

Fixes muxing to end up with a encoder=Lavf... and encoder_eng=somethingelse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa'

* commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa':
  check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)

See: beeb7551d6ab44bc6a1125e6d537508bff3694fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'

* commit 'afe176265480880e1f702c96a8ba434b0d88728b':
  build: export library dependencies in ${name}_FFLIBS

Conflicts:
	common.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'

* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
  lavf: add av_stream_get_side_data

Conflicts:
	doc/APIchanges
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/fate-idct8x8: Defined behavior: eliminate negative left-shifts.

The original code left-shifts negative values, which is undefined
in the C99 specification (the one used during normal FFmpeg compilation).
This change multiplies by (1 << shift), which is functionally equivalent,
but has defined behavior.
With this change, fate-idct8x8 compiled with --fsanitize=undefined works.

Bug-Id: 686

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

The assembly generated by gcc is unchanged by this commit
avutil/cpu: force mmx on selection of higher x86 SIMD features

Fixes various runtime failures with manually set flags that represent no
existing CPU

Fixes Ticket3653

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge branch 'master' of https://github.com/FFmpeg/FFmpeg
Add metadata injection to blackdetect