Commit Graph

15913 Commits

Author SHA1 Message Date
Baptiste Coudurier
31296f6eec add missing html start tag to ffserver status html page
Originally committed as revision 15241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 05:05:10 +00:00
Baptiste Coudurier
a3aa4fed62 cleanup, merge snprintf calls
Originally committed as revision 15240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:56:44 +00:00
Baptiste Coudurier
24b8aa84d0 set default bps to 16 in wav header
Originally committed as revision 15239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:17:15 +00:00
Baptiste Coudurier
a7f361eb13 100l, compute correctly poll_table size when allocating
Originally committed as revision 15238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:16:05 +00:00
Ronald S. Bultje
4fce284c08 Implement RDT-specific data parsing routines. After these changes, simple
playback of RTSP/RDT streams should work. See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:25:47 +00:00
Ronald S. Bultje
99b2ac0797 Reindent after previous patch.
Originally committed as revision 15236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:24:01 +00:00
Ronald S. Bultje
1256d16b6c Implement a RDT-specific SET_PARAMETER command that subscribes to the
first stream in a RTSP/RDT session. See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:22:18 +00:00
Ronald S. Bultje
ff13ba92fd Add dynamic payload handlers to rdt.c. These follow the same API as the ones
in rtpdec.c, so that they can be shared and used in the same way in rtsp.c.
The handlers, since they are specific for RDT, are registered in rdt.c and
a new registration function is thus called from allformats.c.

The dynamic payload handler also implements RDT-specific SDP-line parsing for
OpaqueData and StartTime, which are specific for RDT and needed for proper
playback. OpaqueData contains one or a list ("MLTI") of "MDPR" chunks that
can be parsed by the rmdec.c function ff_rm_read_mdpr_codecdata(). To use
this function, we create a new rdt_demuxer, which has the same private data
as the rm_demuxer. The resulting AVFormatContext created with _open_stream()
can thus be used to call functions in the RM demuxer.

See discussion in "Realmedia patch" thread on ML.

Originally committed as revision 15234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:21:24 +00:00
Ronald S. Bultje
0369d2b045 Give register_dynamic_payload_handler() in rtpdec.c a ff_ prefix and export
it so that I can use it in rdt.c as well. See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:19:26 +00:00
Aurelien Jacobs
74cf481970 bump lavf micro version to allow checking for the matroska/ASS bugfix in r15211
Originally committed as revision 15232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 00:05:30 +00:00
Aurelien Jacobs
a3467f8608 matroskadec: remove now useless vstream and is_video_key_frame
Originally committed as revision 15231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:44:29 +00:00
Aurelien Jacobs
dbfb0e5f36 matroskadec: remove useless braces
Originally committed as revision 15230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:43:24 +00:00
Aurelien Jacobs
24c3da1637 matroskadec: ensure that the timecode added to the index are is the one
of the actual keyframe block, and not the one of the start of the cluster
containing this block.

Originally committed as revision 15229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:39:59 +00:00
Carl Eugen Hoyos
2003e200e0 Whitespace cosmetics
Originally committed as revision 15228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 16:55:29 +00:00
Diego Biurrun
4f31c990d8 license header consistency cosmetics.
Originally committed as revision 15227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 16:15:45 +00:00
Diego Biurrun
78a754cec1 Mention that libavcodec/ac3dec.c is GPLed.
Originally committed as revision 15226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 16:14:20 +00:00
Diego Biurrun
a0528ed7de license header consistency cosmetics
Originally committed as revision 15225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 16:09:57 +00:00
Vladimir Voroshilov
1357b1de00 Remove not approved parts.
Originally committed as revision 15224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 13:45:02 +00:00
Vitor Sessak
4fdb41a84b Test a var for overflow just after it is set
Originally committed as revision 15223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 11:46:29 +00:00
Vitor Sessak
a90fbeec2a Remove useless parentheses.
Originally committed as revision 15222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 11:45:10 +00:00
Stefano Sabatini
6123abad2e Remove wrong and unnecessary condition. VHOOK filters are not special
so they are not supposed to use the printf, fprintf, perror and puts
functions but av_log instead.

Originally committed as revision 15221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 07:26:05 +00:00
JonY
b359a90f95 Undefine the macro which defines fprintf as please_use_av_log so that
fprintf can be used for printing to file.
Patch by JonY <10walls __AT__ gmail @@dot@@ com>

Originally committed as revision 15220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 07:07:07 +00:00
Jean Delvare
92d04e765e Add support for the RGB32 pixel format in video4linux2 devices
Patch by Jean Delvare (khali AT linux-fr DOT org)

Originally committed as revision 15219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 20:40:50 +00:00
Jean Delvare
97a290efcb Add support for the PIX_FMT_RGB555 and PIX_FMT_RGB565 pixel formats in
video4linux2 devices.
Patch by Jean Delvare (khali AT linux-fr DOT org)

Originally committed as revision 15218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 20:36:42 +00:00
Reimar Döffinger
2881a656ff Fix nuv decoder to use reget_buffer for non-keyframes and correctly
identify non-keyframe RTJPEG frames.

Originally committed as revision 15217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 16:31:26 +00:00
Baptiste Coudurier
cf74dd4a5c do not fail if audio is uncompressed and frame size is not set, just set it
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:30:27 +00:00
Baptiste Coudurier
235a51ad31 simplify bps code by using av_get_bits_per_sample
Originally committed as revision 15215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:20:33 +00:00
Baptiste Coudurier
3b38f1c60b simplify function selection code
Originally committed as revision 27528 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-05 01:44:33 +00:00
Baptiste Coudurier
a6100f39a1 enable yuv422p to uyvy converter
Originally committed as revision 27527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-05 00:25:39 +00:00
Vitor Sessak
e10049bef5 Cosmetics: indent after last commit and remove useless braces
Originally committed as revision 15214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:01:23 +00:00
Vitor Sessak
1b0dc0120d Simplify: use a for instead of unrolling by hand
Originally committed as revision 15213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:00:20 +00:00
Vitor Sessak
fb17d9ff54 Functions mace{3,6}_decode_frame() are just wrappers to Exp1to{3,6}(). This commit
moves the code of Exp1to* to the decode functions.

Originally committed as revision 15212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:54:57 +00:00
Aurelien Jacobs
3eb9bfbb84 matroskadec: fix ASS subtitle track packets before emitting them
Matroska does some butchering when storing the ASS lines. The start and end
time are removed (because they are duplicated in the container).
The matroska_fix_ass_packet() function simply restore those start and end
time in ASS lines to ensure our ASS packets comply with the ASS spec.

Originally committed as revision 15211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:26:12 +00:00
Baptiste Coudurier
f2abc55945 add -xerror option, ffmpeg will now exit right when an error occurs
Originally committed as revision 15210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:23:44 +00:00
Baptiste Coudurier
52cf395407 Fix msgsm in wav, do not set blkalign to frame size, this is wrong,
all samples have correct blkalign set to 65

Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:19:53 +00:00
Vitor Sessak
78df225866 Simplify: use two distinct functions to decode MACE3 and MACE6, since the
previous mace_decode_init() function was almost just a switch statement.

Originally committed as revision 15208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:18:28 +00:00
Vitor Sessak
b97c413832 Simplify mace_decode_frame()
Originally committed as revision 15207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:12:20 +00:00
Aurelien Jacobs
62c24705c8 matroska: subtitle display duration must be stored in pkt->convergence_duration
Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:08:19 +00:00
Vitor Sessak
647148c638 Remove useless comments
Originally committed as revision 15205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:02:08 +00:00
Vitor Sessak
251d75f292 Reindent mace.c, its indentation was completly inconsistent with the coding rules.
Originally committed as revision 15204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:00:34 +00:00
Michael Niedermayer
b0880d5da4 Make 16bit grayscale output work.
Originally committed as revision 27524 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 22:58:16 +00:00
Baptiste Coudurier
5d79f30d70 set block align and frame size for gsm in aiff
Originally committed as revision 15203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 22:35:05 +00:00
Michael Niedermayer
736143c8d9 Fix SWS_FAST_BILINEAR and SWS_POINT with some unscaled rgb<->bgr converters.
Originally committed as revision 27523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 22:31:22 +00:00
Vitor Sessak
82ab49dc41 Cosmetics: s/LPC_type/LPC_TYPE/
Originally committed as revision 15202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 22:17:27 +00:00
Michael Niedermayer
9990e4269c Support PIX_FMT_RGB32_1 and PIX_FMT_BGR32_1.
Fixes issue248.

Originally committed as revision 27522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 21:59:15 +00:00
Baptiste Coudurier
6b682df233 print error when deinterlacing fails
Originally committed as revision 15201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 21:48:46 +00:00
Michael Niedermayer
1462302027 Fix 4 and 8 bit RGB/BGR input.
Originally committed as revision 27521 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 20:46:36 +00:00
JonY
f2eb8c5bf6 Properly use av_log rather than fprintf/printf.
Fix the "implicit declaration of function 'please_use_av_log'" warnings.
Patch by JonY <10walls _AT_ gmail #dot# com>

Originally committed as revision 15200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 20:45:13 +00:00
Michael Niedermayer
991945d0e4 Fix typo.
Originally committed as revision 15199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 20:39:09 +00:00
Michael Niedermayer
d52337af70 Remove workaround for rgb/bgr mess.
Originally committed as revision 27520 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 20:16:41 +00:00