projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
41317da
78fa0b9
)
Merge commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab'
author
Mark Thompson
<sw@jkqxz.net>
Wed, 21 Feb 2018 22:40:08 +0000
(22:40 +0000)
committer
Mark Thompson
<sw@jkqxz.net>
Wed, 21 Feb 2018 22:40:08 +0000
(22:40 +0000)
* commit '
78fa0b9033c0834c049e2aedf71a8c613fed87ab
':
h264_metadata: Always add the SEI user data to the first access unit
Mostly already present from
a308872b049e33f69f4b629a06f47e3681906b93
,
one cosmetic change applied.
Merged-by: Mark Thompson <sw@jkqxz.net>
1
2
libavcodec/h264_metadata_bsf.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavcodec/h264_metadata_bsf.c
Simple merge