3d0271ef40
Revert setting audio output channel count for FFmpeg
...
The FFmpeg API needs to be fixed before this can be done sanely.
ffdca wants the desired output channel count to be set in
avctx->channels. Unfortunately it also completely fails if the requested
number of channels is not available rather than returning a different
amount (if 6 channels are requested we'd probably rather use stereo than
fail completely).
ffvorbis ignores caller-set values in avctx->channels. It writes the
channel count there once during init. This means the caller can only
set the count before init because later there would be no indication
whether the channel count in avctx reflects real output.
ffwma requires the caller to supply the encoded channel count
in avctx->channels during init or it fails. So it is not possible to
set a different number of desired output channels there before init
either.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23998 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-02 21:54:14 +00:00
c16275939d
Set lavc_context->channels before opening the codec, it is sufficient to
...
select the desired number of codecs for ffdca and does not break other codecs
like ffvorbis that do not (re)set the channel number during decode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23994 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-01 23:36:40 +00:00
2fe0411b9a
allow to specify the audio bitrate in bits (some codecs need that ...)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23977 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:51:39 +00:00
96f2f7d45f
make timestamps out of hot air
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23974 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:12:28 +00:00
e5935e91ce
make a few more parameters accessable from mplayer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23973 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:09:54 +00:00
aac28cfe4c
Move extern int audio_output_channels; to ad_internal.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23938 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 15:23:25 +00:00
80e0ec3e10
Indicate desired number of output channels to ffmpeg audio decoder.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 15:19:35 +00:00
1233361b46
Avoid void * arithmetic
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 14:52:07 +00:00
1a82dd2267
Use goto instead of useless recursion that might fill up the stack
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23932 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 13:48:08 +00:00
f100b100aa
Do not use a return value for a void function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23931 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 13:46:53 +00:00
d900e7dc5d
Compilation fix workaround for dca.h conflict (it exists in libavcodec
...
and newest versions of libdca)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23851 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-23 22:24:12 +00:00
a57509942b
DTS decoding via libdca
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-22 16:24:25 +00:00
cd1f6674cd
Put a compilation fix bandaid in place for the png.h issue.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23802 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-17 10:56:16 +00:00
71f9c4b48b
Print the number of the Unknow color format,
...
so verbose debug output could be a little more useful.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23770 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-11 21:30:16 +00:00
cd134c85ad
remove unused variables
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23768 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-11 18:08:01 +00:00
b000a6a519
ISO8859-1 --> UTF-8
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23754 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 19:50:36 +00:00
3e9e4acd8d
Do not use leading underscores in multiple inclusion guards, they are reserved.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
ad164e04ee
Get rid of my_memcpy_pic code duplication in many filters.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23686 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-28 11:24:12 +00:00
483d313ee4
config.h must be included before other headers
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23660 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 17:39:54 +00:00
d0d23a71da
Make sure we always have a swab() prototype when we use it,
...
even if we use our osdep/swab.c emulation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23658 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 15:25:32 +00:00
e64f93b9a3
Remove unused (static) function prototype.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23653 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:09:53 +00:00
aebfefd111
Move variable into the block where it actually used
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23651 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:04:48 +00:00
9ed550b3ee
Remove unused query_format function in vf_harddup.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23645 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:01:22 +00:00
ce4d47e879
Avoid more void * arithmetic
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23642 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 12:32:33 +00:00
6b7e82c9eb
100l, fix compile error in r23498 due to bad copy in paste
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23499 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-07 20:01:05 +00:00
34af64d86b
RGB8/BGR8 IMGFMTs are paletted in case of swscale input.
...
Actually they are also for output, but swscale does not support PIX_FMT_PAL8 output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23498 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-07 19:11:25 +00:00
5bddf1de61
Do not use fast_memcpy when data is read again immediately afterwards.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23477 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 15:09:51 +00:00
5d02058b47
Do not use fast_memcpy for small size copy, esp. when the size is constant
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 15:09:49 +00:00
6a09e8e2ed
Replace implicit use of fast_memcpy via macro by explicit use to allow
...
for future optimization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
ac87b4a173
Use avcodec_decode_audio2 in ad_ffmpeg.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23474 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:12:37 +00:00
cc5ea363f8
mjpeg support for v4l2 tv:// driver
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23441 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-01 17:29:35 +00:00
5edd9af248
Remove some unused variables, patch by timwoj ieee org.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
1fdbab9197
Move variable declaration into conditional to avoid an unused variable warning.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23398 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:18:23 +00:00
fb70c99bcc
Remove unused variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23397 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:12:41 +00:00
f05afe18ee
Removed useless fastmemcpy.h includes in video decoders
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23393 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-27 20:45:34 +00:00
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
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
f58a3d0fda
Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-17 00:16:51 +00:00
974fc343bd
Include string.h for memcpy, fastmemcpy.h alone is not enough.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23323 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-16 21:45:46 +00:00
92b7c0aae0
Make vd_raw VDCTRL_QUERY_FORMAT simpler to understand
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23316 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-14 18:21:39 +00:00
3bfd50bdd8
Add DV fourcc.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23306 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-13 17:51:17 +00:00
851b1e6351
Fix "inline keyword not at beginning of declaration" warning.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23237 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-05 12:45:32 +00:00
cce240cd0c
add "level" as lavc option
...
Patch by Gustavo Sverzut Barbieri, barbieri ! gmail x com
reference:
Subject: [MPlayer-dev-eng] [PATCH] add "level" as option to lavc (aka
Mencoder generating PS3 playable h264 videos)
Date: 2007-05-03 13:56 +200
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23227 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-03 17:05:39 +00:00
bd14c1d8c1
Remove unused variable,
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23170 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-29 10:18:39 +00:00
c67220c86f
Add -ass-hinting option for setting font hinting method.
...
It is possible to separately configure hinting for scaled and unscaled osd.
The default is native hinter for unscaled osd (only vo_gl at this point),
no hinting for vf_ass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-27 14:25:36 +00:00
05c7a055e8
Simplify preprocessor directives: There is a general variable for
...
static/shared FFmpeg libraries now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 15:10:07 +00:00
736bf391de
Add config.h variables for static FFmpeg libraries.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23137 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 13:20:18 +00:00
49b64742ed
Add general variables for either static or shared FFmpeg libraries.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23119 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 11:22:22 +00:00
167bafa26f
cosmetics: Rename Makefile variable CONFIG_ASS --> ASS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:38:04 +00:00
5a8c8aadef
cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:35:35 +00:00
uau
reimar
michael
rtogni
diego
iive
lorenm
voroshil
rik
corey
cehoyos
eugeni