Uoti Urpala
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
Uoti Urpala
6d908205fb
Merge svn changes up to r29304
2009-07-07 02:07:11 +03:00
rik
1939b7e3f3
MPV_common_init balks if s->avctx->pix_fmt == PIX_FMT_NONE, so we set it correctly
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29286 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 21:37:07 +00:00
Uoti Urpala
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
rik
a0bd74f06d
follow renaming of pbBufPtr() to put_bits_ptr() by stefano
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29178 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-13 21:43:57 +00:00
Uoti Urpala
0301309425
Merge svn changes up to 27824
...
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
2008-10-25 05:12:34 +03:00
diego
1a85bf593b
#include necessary libavcodec header and remove duplicated struct declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27769 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 16:04:09 +00:00
diego
49faefb669
Remove useless '#undef realloc', realloc is not referenced anywhere near.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27767 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 09:04:40 +00:00
diego
b282622c71
Remove duplicate extern declaration, fixes the warning:
...
libmpcodecs/vf_zrmjpeg.c:73: warning: redundant redeclaration of 'avcodec_initialized'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27766 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 08:56:48 +00:00
Uoti Urpala
259ea9d703
Merge svn changes up to r27573
...
Conflicts:
libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03:00
diego
3311a2ae9c
Replace casual GPL notices by proper license headers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:09:51 +00:00
Uoti Urpala
0e757bf9da
Remove _s/_st suffix from some struct names
...
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
iive
2ae2955f09
Change I_TYPE -> FF_I_TYPE to fix compilation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26323 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-04 01:09: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
rik
b15fe151d6
change license from GPLv2 to 'GPL v2 or later', requested by Diego, I can do that since I wrote the files (based on other stuff from MPlayer (and some external things under GPL v2 or later))
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25454 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-18 21:43:12 +00:00
reimar
b95c80ca86
Make all vf_info_t structs const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25249 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:57:15 +00:00
reimar
13fa313b55
Remove useless fastmemcpy.h include for filters that do not even do any memcpy.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23391 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-27 20:36:04 +00:00
rik
76f47eebd9
compilation fix: ff_ _encode added and temporarily disabled mjpeg_write_tables
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23387 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-27 08:44:27 +00:00
rik
33e225943b
compilation fix clip_uint8 -> av_clip_uint8
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22357 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 15:07:44 +00:00
diego
2240156c34
Properly fix compilation without code duplication.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21746 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 22:35:46 +00:00
rik
cf122d037c
compilation fixes: define always_inline and don't use uint64_t_C
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21740 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-23 13:18:43 +00:00
rik
830063b190
Cosmetics and comments.
...
Patch by Karolina Lindqvist <karolina.lindqvist@kramnet.se>
"This is the whitespace patch for vf_zrmjpeg.c with doxygen comments that I
promised a while ago."
Some additional whitespace fixes by me, there are no functional changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 16:28:57 +00:00
rik
4bb03ad126
Patch by Karolina Lindqvist <karolina.lindqvist@kramnet.se>
...
"This patch is the MMX optimizations for the zrmjpeg filter, which is used by
the zr2 video output driver."
With some small changes by me:
- column width=80
- kept jpeg_enc_* functions static because they confuse the current vo_zr.c
- did not include jpeg_enc.h because jpeg_enc functions are still static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19956 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 15:31:21 +00:00
rik
3d5fedd66a
Patch from Karolina Lindqvist <karolina.lindqvist@kramnet.se>
...
"There is a bug in the zoran -vo zr driver, that makes the output garbled
always. It also probably affects the zrmjpeg filter. This patch takes care of
the problem."
Patch tested and OK. And 10l to me, because this bug probably has existed for a
looong time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 18:49:40 +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
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
rik
fcb57df513
compilation fix (libavcodec sync)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15311 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 08:33:35 +00:00
rik
5405368390
replace almost obsolete email address: snel@phys.uu.nl -> rsnel@cube.dyndns.org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14430 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-08 14:32:26 +00:00
rik
d8e6384a05
fixing segfault: libavcodec doesn't allocate some buffers if avctx->thread_count == 0
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11962 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-16 14:41:42 +00:00
rik
43eba3994c
get_bit_count -> put_bits_count
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11927 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-06 17:23:20 +00:00
rik
fe0b80deee
vf_zrmjpeg MJPEG encoding filter, works together with vo_zr2. Only YV12
...
colorspace input supported for now. Autocropping is also not implemented.
Example usage: mplayer -vo zr2 -vf zrmjpeg foo.avi.
vf_zrmjpeg and vo_zr2 should obsolete vo_zr and libvo/jpeg_enc.c in the future.
Problem is that it needs some paramters of the zoran card (max resolution), for
now the user needs to tell vf_zrmjpeg those parameters (which is stupid,
because zrmjpeg should be able to query vo_zr2 for that information....) The
filter currently uses code which is also present in libvo/jpeg_enc.c, in the
future the (then enhanced) ffmpeg mjpeg encoder should/will be used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11663 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-19 22:15:37 +00:00