diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-02 21:57:01 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-02 21:57:01 -0300 |
| commit | 90adafe6aab81a54b4f5b2a122758e516799dd6a (patch) | |
| tree | f7e06efc24228e8331479116e6e68e2ca0111c87 /libavformat/prompeg.c | |
| parent | cf5a6c754aa3b67062b8cc60fa244e9c7d82010f (diff) | |
| parent | 84ab1cc437fa47a00532f305b9fe15b5b66c8c5e (diff) | |
| download | ffmpeg-90adafe6aab81a54b4f5b2a122758e516799dd6a.tar.gz | |
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
998609ddb8884fd0f33abdb74c8bd4e1234032b1
95f3c85976ff79af6fd10ce3f7a90fcb054c3fc0
e199d90da6473abc0d010797b14f2ae2c9811d34
38d808d72e393f9a769ef1543a7eff15fadc1980
974d508e571085dce43e688595da058804169088
369a3e111cb8015c3a3acc5c2c15728c8f37084f
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/prompeg.c')
0 files changed, 0 insertions, 0 deletions