RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-05-03 16:49:34 +00:00
Code Issues Releases Wiki Activity
20,318 Commits 43 Branches 87 Tags 145 MiB
11a8049263
Commit Graph

1806 Commits

Author SHA1 Message Date
Gabrov
828cf9be9c synced with r18591 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18592 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-06 08:59:05 +00:00
michael
f31bc72365 Motion compensating deinterlacer 
note, the code could probably benefit from some finetuning / experimentation in case anyone is bored ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18591 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-06 00:11:13 +00:00
kraymer
5a79cb37b8 r18577: mention when vo_gl yuv conversion methods are inexact 
r18574: Make aic description a bit more helpful and less misleading.
r18573: Support and document lavc b_sensitivity option.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18588 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 22:17:39 +00:00
gpoirier
7679e38b91 sync with r18567 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18587 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 21:43:01 +00:00
reimar
ad733dd01d mention when vo_gl yuv conversion methods are inexact 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18577 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 11:20:31 +00:00
corey
1934f3b4ea Make aic description a bit more helpful and less misleading. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18574 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 06:57:22 +00:00
corey
5414825bac Support and document lavc b_sensitivity option. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18573 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 06:37:29 +00:00
kraymer
c83400c8a5 r18570: document the recent changes in Snow. new lavcopts: 'refs', 'vqscale=0' 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18571 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 06:21:57 +00:00
lorenm
c7032926c9 document the recent changes in Snow. 
new lavcopts: 'refs', 'vqscale=0'



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18570 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 05:34:26 +00:00
kraymer
5a368332d9 18567: fixed -dvbin :timeout range 
18563: configurable tuning timeout
18561: fixed off by one object_types in -faacopts


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18568 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 00:35:58 +00:00
nicodvb
34c3d97d69 fixed -dvbin :timeout range 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18567 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-04 23:41:44 +00:00
nicodvb
59f8ffc16d configurable tuning timeout 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18563 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-04 23:09:19 +00:00
nicodvb
cf601586ab fixed off by one object_types in -faacopts 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18561 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-04 22:52:02 +00:00
gpoirier
1a9ddf1968 sync with 1.1289 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-15 19:17:57 +00:00
gabrov
c1fac66085 synced with 1.1289 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-14 08:48:08 +00:00
reimar
316bf3ff39 remove stray ')' 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18497 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 23:22:42 +00:00
kraymer
11a747aaa8 grammar fix for 'Syntax' 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18494 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 22:07:59 +00:00
kraymer
379052d8fc 1.1289: support lavc mv0_threshold 
1.1288: Rework the karaoke audio filter section.
1.1287: New karaoke af
1.1286: roff syntax fix
1.1285: like it or not, the vfw options are -(xvfw)opts, not -(vfw)opts


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18493 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 21:59:18 +00:00
corey
447119777b support lavc mv0_threshold 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18490 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 20:18:57 +00:00
gabrov
4a1f25d39e synced with 1.1288 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18480 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 15:18:14 +00:00
diego
8d6e2a0e6b Rework the karaoke audio filter section. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18478 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 14:36:08 +00:00
reynaldo
d6081d2977 New karaoke af 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18471 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 08:46:31 +00:00
diego
6fd961be92 roff syntax fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18448 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-11 21:08:32 +00:00
gpoirier
42d3b25156 like it or not, the vfw options are -(xvfw)opts, not -(vfw)opts 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18447 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-11 20:47:00 +00:00
gpoirier
2a50ec6227 sync with 1.1285 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18446 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-11 20:44:49 +00:00
gabrov
17af6392a2 synced with 1.1284 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18443 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-11 15:32:24 +00:00
kraymer
658dcd44f9 1.284: fix vfw-related things 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18437 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-11 10:19:32 +00:00
gpoirier
19fd398418 fix vfw-related things, patches by RC and Compn 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18434 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-11 05:51:26 +00:00
kraymer
f3347d143c 1.1283: Document xvfwopts. 
1.1282: small layout fix


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18416 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-09 14:56:41 +00:00
diego
f7c80324e9 Document xvfwopts. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18415 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-09 14:38:53 +00:00
diego
3b8ef8b3e1 small layout fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18414 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-09 14:38:07 +00:00
kraymer
5241458319 1.1281: Small wording fix, add parameters to the lavfopts option declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18412 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-09 14:16:08 +00:00
gabrov
54a3ec649f synced with 1.1281 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18380 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-02 23:03:38 +00:00
gpoirier
ac8355d260 sync with 1.1281 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18376 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-01 17:54:48 +00:00
diego
4b52bda380 Small wording fix, add parameters to the lavfopts option declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18374 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-01 17:08:52 +00:00
gabrov
f2fea08fca synced with 1.1280 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18369 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-01 11:43:36 +00:00
kraymer
0891f36cff 1.1280: -lavfopts muxrate in in bits/sec 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18359 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-30 19:25:08 +00:00
nicodvb
d8d8e2f6bd -lavfopts muxrate in in bits/sec 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18358 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-30 18:57:41 +00:00
kraymer
515519f3f2 1.1279: Bump the date. 
1.1278: Correct vglobal description, as pointed out by Loren.
1.1277: cosmetics: Remove trailing whitespace.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18357 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-30 13:30:16 +00:00
kraymer
800f575f8a 1.1276: Consistency for the 'i' key, [does not apply] 
document vglobal, aglobal and i_certify_that_i_am_the_longest_option_ever.
1.1275: Small grammar fix introduced by my previous commit :/ [does not apply]
1.1274: Small clarification to the i keystroke description [previously commited]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18356 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-30 13:16:17 +00:00
kraymer
f0aa823e57 1.1273: small spelling/grammar fixes 
1.1272: clarified restriction on -lavfopts :delay
1.1271: document more -lavfopts entries
1.1270: EDL no longer conditionally compiled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18355 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-30 13:00:35 +00:00
gabrov
16bfc4b9cf synced with 1.1200 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18354 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-30 12:17:10 +00:00
gpoirier
6793e59934 I already bumped the date to tomorrow, which is pre8 "Neu Team Strikes back" due date 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18344 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-29 17:04:57 +00:00
diego
659ad04d72 Bump the date. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18343 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-29 17:01:43 +00:00
gpoirier
da4ef16ec0 sync with 1.1278 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18342 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-29 16:56:55 +00:00
diego
7736644929 Correct vglobal description, as pointed out by Loren. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18339 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 23:51:18 +00:00
diego
5f7d83a8ee cosmetics: Remove trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18335 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 21:37:01 +00:00
diego
3e1871bda8 Consistency for the 'i' key, document vglobal, aglobal and 
i_certify_that_i_am_the_longest_option_ever.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18334 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 21:34:02 +00:00
gabrov
e1902e3087 synced with 1.1124 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18333 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 21:33:55 +00:00
reynaldo
40f4f09120 Small grammar fix introduced by my previous commit :/ 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18332 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 16:44:48 +00:00
gpoirier
f58748b1af Some Fench fixes by Bounec 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18331 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 11:41:03 +00:00
gabrov
ff24d93217 synced with 1.1114 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18329 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 08:00:51 +00:00
reynaldo
790eeaf826 Small clarification to the i keystroke description, it doesnt make an EDL mark unless you are in -edlout mode 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18328 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 06:14:07 +00:00
diego
4f7cc897d4 small spelling/grammar fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18327 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-28 01:52:45 +00:00
nicodvb
19c163b183 clarified restriction on -lavfopts :delay 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18326 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-27 23:00:01 +00:00
nicodvb
6ef55dd8ea document more -lavfopts entries 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18325 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-27 22:44:51 +00:00
gabrov
94101d2cca synced with 1.1100 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18321 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-27 19:07:28 +00:00
diego
43673b01e5 EDL no longer conditionally compiled. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18314 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-27 13:10:38 +00:00
gabrov
430562ad5f synced with 1.1059 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18297 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-26 19:14:12 +00:00
kraymer
105db052fa 1.1269: Kiriuja's rephrasing of the identify=6 v/s -identify issue, ... 
1.1268: small fix on -identify section of the manpage, new line for new sentence and option scaping with an slash
1.1267: Get ride of the several if(identify) messy lines and rearangment of some of the output, ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18296 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-26 17:55:02 +00:00
reynaldo
2c3be6dcf7 Kiriuja's rephrasing of the identify=6 v/s -identify issue, patch by himself, applyed with minor update 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18294 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-26 07:48:26 +00:00
gabrov
f2a257c9b2 synced with 1.1042 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18285 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-25 19:11:02 +00:00
jheryan
0138ef9e2f Synced with 1.1258 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18279 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-25 13:29:35 +00:00
gabrov
edc6690ea4 synced with 1.1036 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18257 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-24 19:00:33 +00:00
reynaldo
3cc923c1f7 small fix on -identify section of the manpage, new line for new sentence and option scaping with an slash 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18254 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-24 16:02:59 +00:00
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-24 07:20:34 +00:00
gpoirier
1275cbfc4e sycn with 1.1266 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18236 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-24 05:44:46 +00:00
kraymer
141b72fe05 1.1266: Remove support for default.sub. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18234 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 23:28:46 +00:00
diego
98aee4cb65 Remove support for default.sub. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 23:26:12 +00:00
kraymer
443947f7b9 1.1265: Add a new command: osd_show_property_text that show an expanded property string on the OSD. 
1.1264: Fix up -msgcharset and MPLAYER_CHARSET.
1.1263: document message charset functionality
1.1262: Add FIXME skeletons for -msgcharset and MPLAYER_CHARSET.
1.1261: sync to x264 r503 (dct_decimate)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18229 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 19:47:29 +00:00
gpoirier
40cbb5d32a sync with 1.1265 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18228 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 16:06:30 +00:00
albeu
116ca0c768 Add a new command: osd_show_property_text that show an expanded property 
string on the OSD. Based on a patch 'by someone named "veal" on irc'
that showed the filename.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18223 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 14:31:54 +00:00
diego
127d546fd6 Fix up -msgcharset and MPLAYER_CHARSET. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18221 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 12:43:50 +00:00
reimar
173d664b68 document message charset functionality 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18217 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-23 08:56:40 +00:00
diego
bd45bc8f34 Add FIXME skeletons for -msgcharset and MPLAYER_CHARSET. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18212 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-22 23:53:52 +00:00
lorenm
94b93ccc69 sync to x264 r503 (dct_decimate) 
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18208 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-22 19:30:57 +00:00
kraymer
c07b14a9b0 1.260: 10l 
1.259: syntax fix for "s" (keyboard control)
1.258: minor markup fixes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18172 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-21 10:54:00 +00:00
kraymer
ffb3dbc09b 10l 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18171 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-21 10:51:50 +00:00
kraymer
7af4532cbc syntax fix for "s" (keyboard control) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18170 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-21 10:45:02 +00:00
kraymer
0b15331980 typo (noticed by "veal" on freenode) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18169 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-21 10:37:35 +00:00
diego
3f08af229f minor markup fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18133 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-18 08:02:39 +00:00
gpoirier
649abe5db0 sync with 1.1257 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18122 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-16 20:53:16 +00:00
kraymer
171a5ec135 1.1257: Fix and improve xinerama support 
1.1256: new monitorpixelaspect option, esp. useful for xinerama setups with upcoming patch
1.1255: [does not apply]
1.1254: -ao pcm:fast suboption for faster-than-realtime dumping


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18121 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-16 20:27:35 +00:00
reimar
7f3d9de556 Fix and improve xinerama support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18117 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-16 13:38:28 +00:00
reimar
02c0f0258f new monitorpixelaspect option, esp. useful for xinerama setups with upcoming patch 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18106 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-15 20:50:33 +00:00
diego
ecc88de7f6 small typo/grammar fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18094 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-14 13:27:55 +00:00
reimar
86b0871127 -ao pcm:fast suboption for faster-than-realtime dumping 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18093 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-14 13:18:35 +00:00
kraymer
b28e7305a4 1.1253: Document sinesupress audio filter, [...] 
1.1252: Document the patch by Walter Belhaven <wbelhaven at yahoo >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18087 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-14 07:36:27 +00:00
gpoirier
ca9d9cf980 Document sinesupress audio filter, thanks to the help of Michael Niedermayer and Jan Knutar. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-13 21:25:37 +00:00
gpoirier
bb2203a63c Fix a few French barbarism, add missing sentence. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18070 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-10 07:28:14 +00:00
gpoirier
172e1f620a synced with 1.1252 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18063 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-09 13:02:47 +00:00
iive
310dda5ed0 New mode for tinterlace filter 
Document the patch by Walter Belhaven <wbelhaven at yahoo >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18057 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-08 15:43:32 +00:00
gpoirier
3b54ec9e28 French fixes, by Bounec 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18054 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-07 21:47:38 +00:00
ptt
da639b027b sync up to 1.1234 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18040 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-04 09:11:53 +00:00
kraymer
12aff69c6f 1.1251: -crash-debug does not get enabled with .developer in the source tree. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18029 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-02 21:25:56 +00:00
diego
cd974cd0e0 -crash-debug does not get enabled with .developer in the source tree. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18018 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-02 07:47:15 +00:00
gpoirier
8a3d3f57ee More French fixes by Bounec 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18011 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-31 21:29:37 +00:00
gpoirier
f35e617c50 French proofreading, by Bounec 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17990 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-29 11:33:13 +00:00
ptt
9142e232cc sync up to 1.223 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17986 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-28 00:15:16 +00:00
gpoirier
3256ed536d synced with 1.1249 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17982 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-27 19:43:46 +00:00
kraymer
f1dfd3b431 1.1250: [applied by Diego, #1.216] 
1.1249: Explain how to separate lavdopts parameters, -lavdopts fast is MPEG-2-only.
1.1248: support custom OSD colour for vo_gl.c
1.1247: fix for the macosx tiger (groff 1.19.x) indentation issue


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17976 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-27 12:41:22 +00:00
diego
b5743fcfda Rename the default GUI skins directory from 'Skin' to 'skins', keeping 
backwards compatibility.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17975 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-27 11:39:27 +00:00
diego
2874b0cfe0 Explain how to separate lavdopts parameters, -lavdopts fast is MPEG-2-only. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17968 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-26 22:56:46 +00:00
reimar
bf291303a1 support custom OSD colour for vo_gl.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17958 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-26 10:43:56 +00:00
jonas
611dc62a43 fix for the macosx tiger (groff 1.19.x) indentation issue 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17951 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-25 22:41:14 +00:00
kraymer
f0daa05353 1.1246: insert linebreak, \-playing-msg option 
1.1245: Shortly describe -playing-msg and -list-properties.
1.1244: Prevent building lavc with xvid support unless xvid version is 1.1 or higher.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17923 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 18:25:21 +00:00
kraymer
db5cd502b1 insert linebreak, \-playing-msg option 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17922 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 18:19:15 +00:00
kraymer
e9d8ef8704 1.1243: 10l 
1.1242: sync to x264 r476 (subq=7)
1.1241: Support libavcodec vrc_strategy=1 (XviD ratecontrol).
1.1240: [applied by diego, commit #1.209]
1.1239: mpegopts example
1.1238: adapter doesn't require vm anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17921 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 18:11:44 +00:00
kraymer
d9c675abd3 1.1237: Capitalize some sentences after colons. 
1.1236: sync to x264 r457 (direct_pred=3)
1.1235: XviD multi-threaded encoding support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17920 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 17:35:39 +00:00
kraymer
2518e91463 1.1234: Add some undocumented options. 
1.1233: Document the noup suboption of the scale video filter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17919 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 17:22:46 +00:00
kraymer
d422e42354 1.1232: put options in alphabetical order 
1.1231: New option: -ignore-start


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17918 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 17:06:34 +00:00
albeu
3aa536d582 Shortly describe -playing-msg and -list-properties. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17917 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-22 17:06:03 +00:00
corey
0e4ebf5383 Prevent building lavc with xvid support unless xvid version is 1.1 or 
higher.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17905 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-21 05:36:10 +00:00
lorenm
4c4c2bd8e0 10l 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17904 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-20 23:16:34 +00:00
lorenm
5283b5beef sync to x264 r476 (subq=7) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17903 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-20 23:13:37 +00:00
gpoirier
12e31cc254 synced with 1.1241 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17900 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-20 21:13:01 +00:00
kraymer
7422f3d2b2 1.1230: Typo fix: "URLs to forces" --> "URLs to force" 
1.1229: Allows the LIVE555 library to forces the client's port to be used...
1.1228: dwStart support for mencoder.
1.1227: This patch removes mmap support because it doesn't have any benefit.
1.1226: Rephrase telecine and film2pal mpegopts.
1.1225: Remove stray space.
1.1224: mention film2pal in -mpegopts
1.1223: -fixed-vo shall no longer be called BETA-CODE.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17894 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-18 20:02:47 +00:00
corey
fac2fee9fe Support libavcodec vrc_strategy=1 (XviD ratecontrol). 
As a side effect, this also makes -lavcopts vcodec=xvid work.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17887 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-17 23:47:10 +00:00
gpoirier
01bb22bcc3 sync with new MEncoder config file name 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17878 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-15 23:20:27 +00:00
diego
47a665f8c9 The system-wide and the user-specific MEncoder configuration file should both 
be called 'mencoder.conf', not two different names over which code and
documentation disagree.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17870 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-14 23:33:37 +00:00
rathann
e6139d5a0f mpegopts example 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17868 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-14 21:57:58 +00:00
gpoirier
ed415d9db2 sync with 1.1238 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17853 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-13 16:36:18 +00:00
faust3
f528470560 adapter doesn't require vm anymore 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17852 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-13 16:17:44 +00:00
gpoirier
329dc03746 synced with 1.1237 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17761 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-07 13:40:20 +00:00
diego
529ae07409 Capitalize some sentences after colons. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17753 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-05 22:29:26 +00:00
lorenm
66419046a2 sync to x264 r457 (direct_pred=3) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17732 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-05 07:23:12 +00:00
gpoirier
99cb97975c Synced with 1.1234, patch by Jiří Heryán < technik AH domotech DOO cz > 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17718 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-03 21:58:30 +00:00
gpoirier
80477378b2 synced with 1.1235 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17706 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-01 09:57:11 +00:00
gpoirier
bc6540bae9 XviD multi-threaded encoding support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17704 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-01 09:18:56 +00:00
diego
ae219c46b7 Add some undocumented options. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17679 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-24 20:28:16 +00:00
diego
ff7e166c4c Document the noup suboption of the scale video filter. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17678 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-24 19:09:14 +00:00
diego
ccaf02739f Remove duplicate explanation of how man page format conversion. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17662 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-21 21:40:51 +00:00
diego
14d023a2ee grammar, put options in alphabetical order 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17659 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-20 23:50:40 +00:00
gpoirier
e1ab85eba4 sync with 1.1231 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17657 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-20 21:05:36 +00:00
corey
6f446f41b5 New option: -ignore-start 
Makes mplayer and mencoder ignore dwStart in AVI files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-20 09:36:10 +00:00
corey
06538c9839 Typo fix: "URLs to forces" --> "URLs to force" 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17653 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-19 21:55:07 +00:00
gpoirier
91f2c3c556 synced with 1.1229 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17652 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-19 21:39:58 +00:00
bertrand
52dd75e903 Allows the LIVE555 library to forces the client's port to be used 
when reading from an RTP/RTSP source.

Patch from Benjamin Zores <ben@geexbox.org> and Patrick Labatut <plabatut@gmail.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17651 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-19 13:27:27 +00:00
corey
89d848a8a2 dwStart support for mencoder. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17649 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-19 09:34:37 +00:00
gpoirier
05e6f3c577 synced with 1.1227 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17624 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-13 12:49:15 +00:00
cladisch
cc8359e4e8 This patch removes mmap support because it doesn't have any benefit. 
Directly accessing the sample buffer makes sense only when the samples
can be constructed in-place.  When the samples are just copied from
another buffer (as is the case with libao2 drivers), the code to copy
those samples is just a reimplementation of snd_pcm_writei(), so we
could as well use that function.

Besides, the current mmap code does not work except in the most simple
cases: it claims to support non-interleaved and complex sample formats,
but treats them the same as interleaved formats and writes to the wrong
memory location.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17617 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-13 11:15:25 +00:00
gpoirier
498490bfbe synced with 1.1226 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17614 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-12 17:51:38 +00:00
diego
5fd172c3e1 Rephrase telecine and film2pal mpegopts. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17611 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-12 16:21:07 +00:00
diego
adbb2c67f8 Remove stray space. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17610 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-12 16:14:07 +00:00
gpoirier
7457379140 sync with 1.1224 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17609 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-12 15:40:40 +00:00
nicodvb
96ad68b6ae mention film2pal in -mpegopts 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17602 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-12 11:09:27 +00:00
ptt
2794a784ae small syntax/upper-lowercase fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17551 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-07 16:04:25 +00:00
gpoirier
4479cb1c8f synced with 1.1223 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17550 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-07 08:54:47 +00:00
danny
31e5fa32fc Minor correction of last two updates 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17549 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-07 08:10:51 +00:00
diego
312bff7977 -fixed-vo shall no longer be called BETA-CODE. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17546 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-07 00:01:38 +00:00
kraymer
73e8a03d74 1.1222: cs and ls swscale parameters accept different value ranges now. 
1.1221: Add -nocache option, -cache is not a flag option.
1.1220: x264 tweaks


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17537 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-05 14:48:02 +00:00
diego
a44e14f304 cs and ls swscale parameters accept different value ranges now. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17536 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-05 14:16:39 +00:00
gpoirier
d7565fdceb synced with 1.1221 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17530 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-03 17:07:43 +00:00
diego
789af5d8ec Add -nocache option, -cache is not a flag option. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17529 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-02 13:14:28 +00:00
lorenm
addfc4c6a7 x264 tweaks 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17527 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-02 05:10:03 +00:00
ptt
3cc6413aab typo fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17526 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-01 09:16:41 +00:00
ptt
de3eed1275 sync up to 1.1216 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17521 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-31 09:00:41 +00:00
kraymer
83fc736735 1.218: typo, consistency 
1.217: Try to only use a linebreak without hyphenation (\:) where it makes sense.
1.216: Unify the handling of escaped spaces.
+ some wording


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17515 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-30 12:54:11 +00:00
jheryan
996a9edd6b Synced with 1.1214 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17514 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-30 12:43:29 +00:00
ptt
4751d6870b sync up to 1.202 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17513 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-30 11:42:50 +00:00
kraymer
6aaad67ce3 1.219: More detailed description of brd_scale. 
1.215: Include MEncoder config files in list of files.
1.214: [does not apply]
1.213: Fix up new profiles section and the MPLAYER_VERBSE environment variable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17512 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-30 11:31:59 +00:00
gpoirier
b04e007e76 synced with 1.1219 + typo fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17511 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-30 10:08:25 +00:00
corey
cd374b05a5 More detailed description of brd_scale. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17507 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 19:56:35 +00:00
gpoirier
d095e8c9f8 synced with 1.1218 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17504 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 17:03:19 +00:00
diego
6d2fa5d69a typo, consistency 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17503 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 14:07:59 +00:00
diego
06e80a26bb Try to only use a linebreak without hyphenation (\:) where it makes sense. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17502 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 14:07:07 +00:00
gpoirier
54e7e82a30 synced with 1.1216 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17501 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 13:22:59 +00:00
diego
1cf085a019 Unify the handling of escaped spaces. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17500 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 02:11:38 +00:00
diego
64ada9ca7b Include MEncoder config files in list of files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-29 02:08:40 +00:00
corey
8690664535 Typo fix: missing "by" in brd_scale recommendation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17478 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 22:44:34 +00:00
diego
5e54599187 Fix up new profiles section and the MPLAYER_VERBSE environment variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17477 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 20:22:57 +00:00
kraymer
dd00bb83d0 1.212: Make -list-options work in both MPlayer and MEncoder. 
1.211: Profiles support.

man page finally in sync!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17476 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 16:34:13 +00:00
kraymer
813c204908 1.1206: sync to x264 r398. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 16:08:57 +00:00
kraymer
0bf4919615 major update of x264encopts, credits go to Alex Günsche < ag .ät. zirona.com>, thank you! 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17474 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 15:50:22 +00:00
albeu
7f28974433 Make -list-options work in both MPlayer and MEncoder. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17473 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 11:34:24 +00:00
albeu
d4d62bbc65 Profiles support. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17472 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-24 11:16:13 +00:00
kraymer
ca2d117189 1.1210: support libavcodec's new sc_factor parameter 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17466 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-22 23:01:00 +00:00
corey
9e0acc3d2e support libavcodec's new sc_factor parameter 
Original idea from Michael; patch by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-22 21:02:14 +00:00
kraymer
062e1930a7 correcting sync version number 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17461 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-22 16:03:29 +00:00
kraymer
931836623c add comment about sync status of this file 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17460 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-22 15:56:32 +00:00
kraymer
eec5f9e04d German man page review part XVII 
covers lines 5161-6316 (for complete review, only x264encopts are left!)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17458 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-22 14:38:05 +00:00
kraymer
d6cebc2589 1.209: consistency fix over the previous consistency fix 
1.208: consitency fix


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17454 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-22 00:32:07 +00:00
gpoirier
2b42383c55 consistency fix over the previous consistency fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17453 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-21 20:32:13 +00:00
gpoirier
2e87e70a8b consitency fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17452 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-21 19:44:48 +00:00
gpoirier
945a2d7938 synced with 1.1208 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17451 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-21 19:39:12 +00:00
kraymer
dfe9a57e22 German man page review part XVI 
covers lines 4101-5160


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17450 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-21 13:52:47 +00:00
kraymer
7ca402fa09 1.1207: MPLAYER_VERBOSE, new enviorment variable to control verbosity before init 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17449 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-21 10:42:39 +00:00
kraymer
a234e2957b German man page review part XV 
covers lines 3547-4100


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17448 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-21 01:24:37 +00:00
ods15
6fd34c98b6 MPLAYER_VERBOSE, new enviorment variable to control verbosity before init 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17441 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-20 20:38:46 +00:00
kraymer
58187db2ef German man page review part XIV 
covers lines 2712-3546


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17435 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-20 00:18:55 +00:00
kraymer
58c577a6f3 German man page review part XIII 
covers lines 1587-2711


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17423 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-18 02:12:17 +00:00
kraymer
d801abb541 German man page review part XII (right from the beginning.. again..) 
covers lines 1-1586


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17422 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-17 21:54:39 +00:00
kraymer
42827133d4 German man page review part X: 
("CODEC-SPEZIFISCHE ENCODING-OPTIONEN (NUR BEI MENCODER)")
^-- completed except for x264encopts
+ added section: FFmpeg-libavformat-Muxer
+ review of de/mplayer.1 patch #1.169


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17412 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-16 23:41:04 +00:00
gpoirier
e510ca7705 sync with 1.1206 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17405 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-16 09:00:36 +00:00
lorenm
7bf3599898 sync to x264 r398. 
patch by Guillaume Poirier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17403 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-16 01:37:32 +00:00
kraymer
2af5b1d4bc German man page review part X: 
("CODEC-SPEZIFISCHE ENCODING-OPTIONEN (NUR BEI MENCODER)")
incomplete - revied: xvidencopts, added options: (no)lumi_mask, profile


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17393 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-14 21:54:50 +00:00
kraymer
77ff2b9f85 German man page review part IX: 
("CODEC-SPEZIFISCHE ENCODING-OPTIONEN (NUR BEI MENCODER)")
incomplete - codecs reviewed in this patch: rest of lavc, nuv


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17391 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-14 18:59:45 +00:00
kraymer
3d0ea3f326 German man page review part VIII 
("CODEC-SPEZIFISCHE ENCODING-OPTIONEN (NUR BEI MENCODER)")
incomplete - codecs reviewed in this patch: *lame, faac, parts of lavc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17383 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-14 00:06:23 +00:00
kraymer
12b54f0837 German man page review part VII 
("ALLGEMEINE ENCODING-OPTIONEN (NUR BEI MENCODER)")
+ wording: "erhälst" -> erhältst
added option: -frameno-file


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17381 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-13 22:29:11 +00:00
kraymer
4411941ab9 wording fix 
1.1205: [does not apply] (?)
1.1204: minor rewording
1.1203: This patch makes real rtsp tell the server to deliver data at specified
bandwidth [...]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17365 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-12 00:25:15 +00:00
kraymer
2b2d13c4a5 1.1202: Reformat examples to prevent linebreaks and hyphenation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17364 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-12 00:03:58 +00:00
kraymer
e0f3662c94 1.1201: Explain DVDREAD_NOKEYS environment variable. 
1.1200: [does not apply / previously applied]
1.1199: Expand the configuration file section to include MEncoder examples.
1.1198: [does not apply]
1.1197: removed frame reording option
1.1196: small wording/spelling/syntax fixes
1.1195: add bitexact's lavd flag desc.
1.1194: [left out for later work on x264!]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17363 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-11 23:43:55 +00:00
kraymer
2c85ab1c23 1.1193: [does not apply] 
1.1192: minor grammar/punctuation on lavc's keyint option
1.1191: further wording fix for uspp
1.1190: Support vme=8 (iterative overlapped block).
1.1189: Include the snow wavelet comparison functions from DOCS/tech/snow.txt
1.1188: wording
1.1187: Add bidir_refine to lavc's set of options, and document it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17362 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-11 23:03:50 +00:00
kraymer
ac883e9ed2 1.1186: Merry Christmas and happy cola-chugging! 
1.1185: Adds lavc's brd_scale and updates vb_strategy
1.1184: This cache-seek-min is definitly implemented. The not implemented one got removed...
1.1183: The <=132 frame rule is only valid at MacroBlock level not at frame one.
        Following it gives worse compression even with IP sequence.(B-Frames doesn't accumulate error)
1.1182: reverse the H264 hack
1.1181: fspp update


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17360 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-11 22:09:55 +00:00
danny
458adbba99 Minor correction of last updates, credit to Paul TT 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17353 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-09 07:46:17 +00:00
gpoirier
e0102af232 sync w/ 1.1205 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17350 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-08 21:41:01 +00:00
diego
c18eb8190c Remove non-ASCII character. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17349 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-08 19:06:13 +00:00
diego
b09fcd306a minor rewording 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17338 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-07 22:06:06 +00:00
rtognimp
b59db28355 This patch makes real rtsp tell the server to deliver data at specified 
bandwidth, if bandwidth cmdline option is given. Also, if that's given,
it uses it for sdp stream selection. If not given, the behavior is the
same as before.

It's used to implement something like turboplay in realplayer.

Patch by Tomas Janousek >>> tomi (At) nomi (.) cz <<<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17333 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-06 14:39:10 +00:00
diego
2f095cc061 Reformat examples to prevent linebreaks and hyphenation. When occurring 
at the wrong spot they can be extremely confusing for novices.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17332 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-06 14:03:51 +00:00
diego
0d02e37001 Explain DVDREAD_NOKEYS environment variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17316 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 16:17:05 +00:00
gpoirier
a68b16aec1 Update copyright date to 2006 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 15:28:02 +00:00
diego
31115ac56a Expand the configuration file section to include MEncoder examples. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17310 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 15:01:30 +00:00
gpoirier
77a8d0f329 synced with 1.1198 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17307 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 08:20:27 +00:00
ptt
f23e0d6ab7 little fixes i looked at after previous cvs commit :-) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17306 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 00:34:38 +00:00
ptt
3bfe5f4912 sync with 1.1198 plus little fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 00:24:14 +00:00
ptt
b300f14562 fixed indentation for suboption brd_scale 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17304 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-04 00:01:39 +00:00
gpoirier
1751210db9 synced with 1.1197 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17303 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-03 22:27:09 +00:00
nicodvb
62bc91fba2 removed frame reording option 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17300 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-03 22:05:03 +00:00
ptt
18887a0811 word consistency fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17297 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-03 17:18:44 +00:00
ptt
355b657ec3 sync up to 1.1167 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17296 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-03 17:12:16 +00:00
diego
465d9a7f2a small wording/spelling/syntax fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17292 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-03 14:23:03 +00:00
gpoirier
3a59b54700 add bitexact's lavd flag desc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17291 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-03 13:07:54 +00:00
jheryan
e7a0c5de3b Synced with 1.1182 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17285 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-02 13:02:20 +00:00
gpoirier
45be1244ae synced with 1.1194 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17271 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-30 08:38:11 +00:00
gpoirier
be8503ce4d synced with 1.1192 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17270 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-30 08:13:59 +00:00
lorenm
457b63508d sync to x264 r390 (bime) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17269 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-30 05:15:27 +00:00
wanderer
f0b0762166 for roff: add missing linebreak in uspp description 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17268 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-30 05:08:37 +00:00
wanderer
ec5b640403 minor grammar/punctuation on lavc's keyint option 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17267 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-29 19:24:06 +00:00
wanderer
860fd154d2 further wording fix for uspp 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17266 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-29 19:17:42 +00:00
diego
f71dd5c4c8 Support vme=8 (iterative overlapped block). 
patch by Corey Hickey < .. bugfood-ml .. @ .. fatooh .. . .. org .. >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17262 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-29 17:01:33 +00:00
diego
4f17ae579b Include the snow wavelet comparison functions from DOCS/tech/snow.txt 
in the man page.
patch by Corey Hickey < .. bugfood-ml .. @ .. fatooh .. . .. org .. >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17261 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-29 16:59:14 +00:00
diego
e802d2db5b wording 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17260 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-29 16:56:35 +00:00
gpoirier
b44bf0d4d9 Add bidir_refine to lavc's set of options, and document it. 
Patch by Corey Hickey < bugfood DASH ml AHHH fatooh POIS org >


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17257 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-28 08:45:18 +00:00
gpoirier
8cb2685e50 Merry Christmas and happy cola-chugging! 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17247 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-26 06:27:56 +00:00
gpoirier
74f1ad8a0a Adds lavc's brd_scale and updates vb_strategy 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17245 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-25 21:33:15 +00:00
gpoirier
bd368b82f2 synced with 1.1184 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17243 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-25 20:42:27 +00:00
iive
5db2fddec5 This cache-seek-min is definitly implemented. The not implemented one got removed... 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17235 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-24 18:08:32 +00:00
iive
b189efcebb The <=132 frame rule is only valid at MacroBlock level not at frame one. 
Following it gives worse compression even with IP sequence.(B-Frames doesn't accumulate error)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17234 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-24 16:13:12 +00:00
gpoirier
1d5cb76c89 synced with 1.1182 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17232 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-22 09:36:50 +00:00
henry
335f35f2bf reverse the H264 hack 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17226 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-19 18:04:37 +00:00
henry
cbfe8d21d0 fspp update 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17225 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-18 18:13:09 +00:00
ranma
c3a56339d1 1.1180: [does not apply] 
1.1179: Removing obsolete, and until recently, misdocumented option -verbose.
1.1178: make -o mandatory and add a warning when the extension does not match
        the container format, patch by Reynaldo Pinochet
1.1177: Another examples showing how to play raw YUV video samples
1.1176: Make -really-quiet a common option.
1.1175: Fix -v/-verbose description.
1.1174: 10l: \ needs to be escaped in roff.
1.1173: 1/4l
1.1172: Formatting fix
1.1171: Give an example about how to use the famous cqif video samples


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17217 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-17 20:02:47 +00:00
ranma
ad18130764 typo: ouput -> output 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17215 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-17 19:58:24 +00:00
ods15
e9c36ee295 Removing obsolete, and until recently, misdocumented option -verbose . 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17209 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-17 18:10:51 +00:00
gpoirier
4b4da47d0c sync w/ 1.1178 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17205 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-17 15:13:42 +00:00
wanderer
83e5f5e72a make -o mandatory and add a warning when the extension does not match the container format, patch by Reynaldo Pinochet 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17197 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-15 17:57:18 +00:00
gpoirier
ef056dba90 Another examples showing how to play raw YUV video samples 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17181 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-11 22:09:55 +00:00
gpoirier
3b1633f737 sync with 1.1176 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17178 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-11 21:17:29 +00:00
diego
1e255f168e Make -really-quiet a common option. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17176 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-11 18:05:23 +00:00