Commit Graph

46 Commits

Author SHA1 Message Date
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
reimar 5fcb179834 XVID profile array should be const, so it is in rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28221 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:16:52 +00:00
iive 08ec85ba4b Revert commit r26897.
XviD is the correct spelling of the codec. 
You can see it written in the codec own 
documentation and header files.

Prefered name capitalization confirmed 
in conversation with XviD developer (prunedtree).



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26915 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-28 23:04:41 +00:00
diego 8ac2b7bbf5 cosmetics: XviD --> Xvid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 12:41:27 +00:00
diego c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 00:23:02 +00:00
diego 47ef593617 Use standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26759 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 10:16:20 +00:00
diego 21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
diego 835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
iive 1bc5cc764b Use the proper option name for constant quantizer
in the hint that user gets if there isn't any of
the essential options.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25837 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 14:32:15 +00:00
diego e27d606714 Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved
for the system, names starting with _ are reserved at file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25635 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 23:20:15 +00:00
zuxy 1c6f85026a Silence a gcc warning: "wrong type argument to increment".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24763 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-11 09:47:03 +00:00
iive 944b5d2acd Define profiles_t as const to fix a warning. Prevent profiles[] from been exported.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24649 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 21:06:45 +00:00
iive e371194632 Remove imported rational calculation code and use the original one from avutil.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24315 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 10:50:36 +00:00
diego 20d778b3fa Add explicit location for headers from the libmpdemux/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:51:32 +00:00
diego 6b14d50848 Add explicit location for headers from the stream/ directory.
Now for the encoding-related files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:30:55 +00:00
nicodvb cf099b2100 muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +00:00
gpoirier 087b6f4c1b Use American spelling of "gray" instead for British's "grey" for XviD option, while keeping backward compatibility
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20265 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-16 11:57:11 +00:00
corey 30ad3c812e make PSNR printing more consistent with other encoders
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20023 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-03 23:20:31 +00:00
diego 66b1d0d001 The FSF changed postal address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 12:11:11 +00:00
diego 60f223f766 Move #ifdefs around complete files into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 14:49:09 +00:00
michael 02b199e5e9 passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 21:26:42 +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
corey 960b978a03 Fix video delay when encoding with B-frames.
Encoding delay is adjusted for on-the-fly during encoding.

Decoding delay is compensated for by setting an appropriate dwStart on
the audio stream (only in muxer_avi at this point).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17660 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-21 09:39:22 +00:00
michael e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +00:00
diego 36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
ods15 11f81c76f9 code before decleration, gcc2.95 fix
patch by Jan Knutar (jknutar SIGH nic BOOM fi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16616 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-28 17:25:21 +00:00
gpoirier ef98da6060 make xvid encoding use the filename from
-passlogfile to store and retreive pass information.
Patch by Olivier Rolland < billl AH users POIS sf POIS net>
Original thread:
Date: Sep 25, 2005 9:41 PM
Subject: [MPlayer-dev-eng] [PATCH] XviD and -passlogfile


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16603 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-26 10:43:34 +00:00
gpoirier 7ea57ab9f3 10l: fully working DXN profile support require XviD 1.1.x. Earlier version will work but will lack VBV support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16516 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-18 17:22:04 +00:00
gpoirier ba6153a7d2 adds Simple, Advanced Simple and DivX profile support for XviD, Patch by Robert Swain < robert POUM swain AH gmail POUM com >
Nice help from Diego Biurrun, Reimar Döffinger, Guillaume POIRIER
Original thread:
Date: Sep 10, 2005 8:45 PM
Subject: [MPlayer-dev-eng] [PATCH] XviD profile support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16482 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 21:04:44 +00:00
iive f05fcfafd4 gcc-2.95.3 fix, patch inspired by Steven M. Schultz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15665 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-06 17:27:46 +00:00
gpoirier 0836c5a899 Add XviD's luminance masking (option name: lumi_mask)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15639 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-04 20:54:49 +00:00
gpoirier e6f5f5a187 XviD zones support. Patch by Doom9: < feedback123 GROOVY doom9 STEADY org >
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15620 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-02 22:01:38 +00:00
gpoirier 4d2db1c5d2 Better defaults encoding settings for XviD, intended to be a good tradeoff CPU/PSNR.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15071 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-08 19:14:04 +00:00
henry 18abbb69a1 fixes for encoding of multiple files
- do not uninitialize video encoder between files
- checks for image size & format change moved from mencoder.c to vfilters

by Oded Shimon <ods15@ods15.dyndns.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14879 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-01 20:21:58 +00:00
reimar b46fa6a150 Initialized BITMAPINFOHEADER to 0 to avoid problems, esp. windows has problems
when unused parts have bogus values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14550 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-20 22:53:37 +00:00
gpoirier 1cf20eef7e have each XviD's option flag have its (no)counterpart
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13854 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-02 17:22:24 +00:00
rathann f1b9d02c19 Bitrate setting option in ve_xvid4.c doesn't follow the rules described
in manpage (i.e. if bitrate > 16000, then it's in bits/s, not kbits),
unlike lavc and the old ve_xvid.c do. Fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13676 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-18 20:00:07 +00:00
iive 9617b9d987 Sync with GomGom's patch-12 version.
updated copyright
  bvhq options added (xvid 1.1+ api4.1)
  psnr handling moved in separate functions
  proper free() on uninit
  printf -> mp_msg
  capability to flush delayed frames
Changes by me (iive)
  support for flushing delayed frames at the end
  suppressed cosmetics and new aspect code changes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13611 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-11 15:48:18 +00:00
iive 22d7a06cf8 fix 10l fixed_quant bug reported by Michael
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12807 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-13 18:09:58 +00:00
ranma 7068c1b886 Use aspect from encoder for AVI vprp header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-24 15:16:36 +00:00
iive 742843458f allow using of float fixed_quant
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11930 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-06 23:45:53 +00:00
iive a0c452f355 psnr and debug option added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11921 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-04 23:18:25 +00:00
iive 32ebccbe67 new options - aspect,autoaspect,turbo,chroma_opt. patch by Nico <nsabbi@tiscali.it> and Edouard Gomez
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11913 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-02 19:51:39 +00:00
iive 7577eb50c4 xvid 1.0 beta2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11587 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 16:56:46 +00:00
iive 82fa16b8df use the old names for 4 options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11492 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-18 01:24:23 +00:00
iive 418bca78a9 XviD Api4 driver from http://ed.gomez.free.fr/
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11438 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-12 00:50:43 +00:00