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
Martin Jansa
Merge remote-tra
c
kin
g
b
ranch
'
mpla
y
er
/
m
ast
e
r'
commit
|
commitdiff
|
tree
2010-11-25
Martin Jansa
Merge r
e
mote
branch 'mplayer/m
a
ster'
commit
|
commitdiff
|
tree
2010-06-23
M
a
rtin J
a
ns
a
codec-cfg
.
c:
add MPG4 (lost
i
n
conflicts resolution)
commit
|
commitdiff
|
tree
2010-06-23
Mart
i
n
Jan
s
a
M
erge
r
e
m
ote branch 'm
p
la
y
er/master'
commit
|
commitdiff
|
tree
2010-04-28
Mart
i
n Jan
s
a
m
p
_
ima
g
e
.
c: add IMGFM
T
_
M
PEG4 (moved
f
rom mp_image
.
h)
commit
|
commitdiff
|
tree
2010-04-28
Mar
t
in
Jansa
Merge re
m
ote branch 'mpl
a
yer/mas
t
er'
commit
|
commitdiff
|
tree
2010-03-16
Martin
J
ansa
Makef
i
le: fix c
o
n
f
l
i
ct
resolut
i
on
commit
|
commitdiff
|
tree
2010-03-11
Martin Jansa
Merge
r
e
m
ote branch 'mplayer/master'
commit
|
commitdiff
|
tree
2010-02-26
Ma
r
tin
J
a
nsa
M
e
rge remot
e
bra
n
ch
'mpla
y
er/
m
aster'
commit
|
commitdiff
|
tree
2010-02-01
Martin Jansa
Merge remote branch
'
mplay
e
r/mas
t
er'
commit
|
commitdiff
|
tree
2010-01-10
Mart
i
n
Jansa
M
e
rge rem
o
te branch 'mplayer/m
a
s
t
e
r'
commit
|
commitdiff
|
tree
2009-11-19
M
a
rtin Jansa
Me
r
ge remo
t
e branch 'mplayer/master'
commit
|
commitdiff
|
tree
2009-11-19
Mar
t
in J
a
n
sa
remove liba
f
/
a
f_lavcac3enc
.
c
commit
|
commitdiff
|
tree
2009-11-19
Mar
t
in Jans
a
Mod
i
f
y
co
n
tr
o
l() prototype to match the one i
n
video
_
out_i
n
t
.
.
.
commit
|
commitdiff
|
tree
2009-11-01
Martin Jansa
Merge remote branch 'mplayer/t
m
p_
b
uild'
commit
|
commitdiff
|
tree
2009-10-26
Martin Ja
n
sa
Merge r
e
mote
b
ranch 'mplayer/tmp_build'
commit
|
commitdiff
|
tree
2009-07-21
Martin Jansa
Fin
i
sh
merge
commit
|
commitdiff
|
tree
2009-07-21
Martin Jans
a
Merge branch 'master
'
of git://repo
.
or
.
cz
/
mp
l
ayer into
m
ob
commit
|
commitdiff
|
tree