git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5ffbfe3
d52208e
)
Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'
author
Clément Bœsch
<clement@stupeflix.com>
Tue, 21 Jun 2016 11:18:47 +0000
(13:18 +0200)
committer
Clément Bœsch
<clement@stupeflix.com>
Tue, 21 Jun 2016 11:18:47 +0000
(13:18 +0200)
* commit '
d52208e8d549d4c84a2a348aa3790b1a177e779a
':
mmaldec: Add mpeg2 decoding support
This commit is a noop, see
7ebe12fc55591053cbd194ca6638e5c32beaee45
Merged-by: Clément Bœsch <clement@stupeflix.com>
Trivial merge