repo.or.cz
/
mplayer
/
glamo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge remote-tracking branch 'mplayer/master'
2011-01-31
Mart
i
n
J
ansa
Merge remote-t
r
acking
br
a
nch 'mplayer/
m
a
s
ter'
commit
|
commitdiff
|
tree
2010-11-25
Mar
t
i
n Jansa
Merge r
e
m
o
te
b
r
a
n
ch
'
mplayer/master'
commit
|
commitdiff
|
tree
2010-06-23
Martin J
a
nsa
codec
-
c
f
g
.
c: add MPG4 (lost in conflicts r
e
solution)
commit
|
commitdiff
|
tree
2010-06-23
Martin Jansa
M
erge remo
t
e branch 'mpl
a
yer/master'
commit
|
commitdiff
|
tree
2010-04-28
Martin Jansa
mp_image
.
c
: add IMG
F
MT_
M
PEG4 (m
o
ved from m
p
_image
.
h)
commit
|
commitdiff
|
tree
2010-04-28
Martin Jansa
M
erge remote bran
c
h 'mplayer/master'
commit
|
commitdiff
|
tree
2010-03-16
M
arti
n
Jansa
Makefile:
f
ix conflict resoluti
o
n
commit
|
commitdiff
|
tree
2010-03-11
Martin Jan
s
a
Merge remote branch 'mp
l
ayer/master'
commit
|
commitdiff
|
tree
2010-02-26
Martin Jansa
Me
r
ge remote branch '
m
play
e
r/m
a
ster'
commit
|
commitdiff
|
tree
2010-02-01
Martin Ja
n
sa
Merge remote bra
n
ch 'mplayer/master'
commit
|
commitdiff
|
tree
2010-01-10
Marti
n
Jansa
Merg
e
remote branch 'mplaye
r
/mas
t
er'
commit
|
commitdiff
|
tree
2009-11-19
M
art
i
n Jans
a
Merge remote
bra
n
ch 'm
p
laye
r
/ma
s
te
r
'
commit
|
commitdiff
|
tree
2009-11-19
Martin Jansa
remove liba
f
/af_lavca
c
3enc
.
c
commit
|
commitdiff
|
tree
2009-11-19
Martin Ja
n
sa
Modify control() prototype t
o
mat
c
h the one in v
i
deo_out_int
.
.
.
commit
|
commitdiff
|
tree
2009-11-01
Marti
n
Jansa
Me
r
ge remot
e
branch 'mplay
e
r/tmp_bu
i
ld'
commit
|
commitdiff
|
tree
2009-10-26
Martin
J
ansa
Merg
e
remot
e
branch '
m
pl
a
y
er/tmp_build
'
commit
|
commitdiff
|
tree
2009-07-21
Martin
Jansa
Fi
n
ish merge
commit
|
commitdiff
|
tree
2009-07-21
Martin Jansa
M
erge
b
ranch 'mas
t
er' of git
:
//repo
.
or
.
cz/mplayer into mob
commit
|
commitdiff
|
tree