OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93a0f4a 39cdbb1)
Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 09:33:56 +0000 (11:33 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 09:38:53 +0000 (11:38 +0200)
* commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a':
  dxva2_h264: Unbreak compilation after 3176217c6

This commit is a noop. The compilation was fixed in the merge commit
itself (1534ef87c74cc66a117bf61c467641c2129bc964). The additional local
unused sps is not merged.

Merged-by: Clément Bœsch <clement@stupeflix.com>

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