]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7336fa 8385ba5)
Merge commit '8385ba53f115401a67a4748c0d107769ebfb2941'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 17:01:51 +0000 (18:01 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 17:01:51 +0000 (18:01 +0100)
* commit '8385ba53f115401a67a4748c0d107769ebfb2941':
  mmaldec: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/mmaldec.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/mmaldec.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.