OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc91bc1 c23152a)
Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:49:15 +0000 (21:49 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:49:56 +0000 (21:49 +0100)
commit972df59f4f4d30e44e5544c4f1aa43ef83a19757
tree0c2ec8349ff1763d5f48454b8b9f26374dbd80b0tree | snapshot
parentbc91bc1d8b2baa29267b5181d805f5286466cadecommit | diff
parentc23152a90371bfe971b063781ef4e7d9d5ef9d70commit | diff
Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'

This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.

* commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70':
  avplay: convert do codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
external/ffmpeg
About OSDN
Find Software
Develop Software
Help