1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e'

* commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e':
  movenc: allow alternative hvc1 h.265 codec tag
  movenc: write correct format hvcc when tag is hvc1
  movenc: move tags definitions to where they are used
  movenc: simplify codec_tag lookup
  movenc: use correct tag list for AVOutputFormat.codec_tag
  aarch64: vp9: Fix assembling with Xcode 6.2 and older
  doc: Drop the legacy symlink to README

This commit is a noop, see
998609ddb8
95f3c85976
e199d90da6
38d808d72e
974d508e57
369a3e111c

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-02 21:57:01 -03:00
commit 90adafe6aa

Diff Content Not Available