OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 730f75a 9026ec8)
Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:46:24 +0000 (10:46 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:46:24 +0000 (10:46 +0200)
* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
  matroskadec: make sure not to leave EbmlBin in an inconsistent state

This commit is a noop, see 5e1bacf2d49622f7ba4245f140b7be35972c0529

Merged-by: Clément Bœsch <cboesch@gopro.com>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help