1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

17240 Commits

Author SHA1 Message Date
Carl Eugen Hoyos
3a095bee2b Silence one warning when compiling with icc:
warning #188: enumerated type mixed with another type
      if((q->bitrate = determine_bitrate(avctx, buf_size, &buf)) == I_F_Q)
                     ^

Originally committed as revision 16374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 19:44:47 +00:00
Carl Eugen Hoyos
2c67c65963 Fix h264 decoding on SSE2 cores with icc compilation.
Originally committed as revision 16373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 19:40:13 +00:00
Stefano Sabatini
055068d001 Mention in the documentation of avfilter_poll_frame() that it returns
a negative value in case of error.

Originally committed as revision 16372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 17:07:47 +00:00
Kostya Shishkov
5b3658f73b Fix a typo that made VMD demuxer always assume Indeo 3 as video codec.
Spotted by Robert Swain

Originally committed as revision 16371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 16:22:42 +00:00
Stefano Sabatini
5d91e92853 Use avcodec_check_dimensions() for checking the frame size validity.
The v4l.c check is moved after the eventual automatic size detection,
so the check in that case is performed on the new set values.

Originally committed as revision 16370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 14:41:19 +00:00
Ronald S. Bultje
ade8fb4d75 Reindent after r16368.
Originally committed as revision 16369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 05:59:11 +00:00
Ronald S. Bultje
a9f84821c5 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in
"[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 05:58:23 +00:00
Ronald S. Bultje
5d88c2647d Change audio_pkt_cnt from an array into a single field, since only a single
member of the array is ever used (compare to RMDemuxContext->audio_pkt_cnt).
See "[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 05:55:09 +00:00
Ronald S. Bultje
886e89d0d0 Add RMStream object as function argument to public functions so that non-.rm
AVStreams can be used to call these public rmdec.c functions as well, as is
the case for RDT/RTSP streams. See mailinglist discussion in "[PATCH] rdt.c:
don't reuse the same AVStream in both RTSP and RM demuxer" thread.

Originally committed as revision 16366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 00:21:11 +00:00
Ronald S. Bultje
ba61472911 Implement RMStream stream-specific private data object in the RM demuxer.
This allows multiple video or audio streams per .rm file. See mailinglist
thread "[PATCH] rmdec.c: implement RMVideo/AudioStream".

Originally committed as revision 16365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 00:18:38 +00:00
Måns Rullgård
23ae2b68b0 Replace UNALIGNED_STORES_ARE_BAD with !HAVE_FAST_UNALIGNED
Originally committed as revision 16364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 23:12:00 +00:00
Kostya Shishkov
10f35ebddd Latest Coktel Vision VMDs contained Indeo 3, add demuxer support for it
Originally committed as revision 16363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 17:34:00 +00:00
Måns Rullgård
edf7c2b26f simple_idct: use MUL16 and MAC16 from mathops.h
Originally committed as revision 16362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 16:25:36 +00:00
Diego Biurrun
643d2e880f Avoid POSIX-reserved _t namespace.
Originally committed as revision 28195 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-12-27 11:45:46 +00:00
Stefano Sabatini
df77a6daab Make the VIDIOCMCAPTURE ioctl error message consistent with the other ones.
Originally committed as revision 16361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:44:56 +00:00
Stefano Sabatini
faf67322dc Add missing check on the return value of the VIDIOCSWIN ioctl.
Originally committed as revision 16360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:40:07 +00:00
Diego Biurrun
cb82a0736d consistency cosmetics: Rename POWERPC identifiers to PPC.
Originally committed as revision 28194 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-12-27 11:33:54 +00:00
Diego Biurrun
79cb09b2f7 consistency cosmetics: Rename POWERPC identifiers to PPC.
Originally committed as revision 16359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:33:26 +00:00
Luca Barbato
d89eae6f1a Remove stray code
Originally committed as revision 16358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:30:30 +00:00
Luca Barbato
a6b4448cdf Cleanup _t types in libavcodec/ppc
Originally committed as revision 16357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:21:28 +00:00
Stefano Sabatini
7f9b3266c9 Change thisIsAVar variable names to this_is_a_var style, more
consistent with the rest of libav*.

Originally committed as revision 16356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 09:31:05 +00:00
Reimar Döffinger
b870027a19 Bump minor number for many small improvements, tiff fax decoding,
AVCodecContext refs is set during decoding.

Originally committed as revision 16355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 09:22:21 +00:00
Stefano Sabatini
9864142b6d Fix and extend documentation for avfilter_graph_get_filter().
Originally committed as revision 16354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 22:25:47 +00:00
Stefano Sabatini
e916c2ac6a Fix typo: ommitted -> omitted.
Originally committed as revision 16353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 20:26:44 +00:00
Måns Rullgård
f23740d96f ARM: NEON optimised float_to_int16
Originally committed as revision 16352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 19:52:52 +00:00
Stefano Sabatini
22730e8790 Put pass_logfilename_prefix check on a single line, improve readability.
Originally committed as revision 16351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 19:28:42 +00:00
Stefano Sabatini
ad16627fa0 Rename variables:
pass_logfilename -> pass_logfilename_prefix
DEFAULT_PASS_LOGFILENAME -> DEFAULT_PASS_LOGFILENAME_PREFIX

and make clear in the passlogfile OptionDef help string that it takes
a file name prefix rather than a file name.

Originally committed as revision 16350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 19:25:24 +00:00
Michael Niedermayer
92799d3213 Enable faxcompr.
Originally committed as revision 16349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:42:26 +00:00
Michael Niedermayer
a56f82eaf8 indent
Originally committed as revision 16348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:39:24 +00:00
Michael Niedermayer
537bf4266f Simplify vertical mode
Originally committed as revision 16347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:39:07 +00:00
Michael Niedermayer
eb0094b224 And another sechole ...
Originally committed as revision 16346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:14:59 +00:00
Michael Niedermayer
268309750b Fix yet another sechole.
Originally committed as revision 16345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:06:29 +00:00
Michael Niedermayer
11c5999e20 Fix another sechole.
Originally committed as revision 16344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 17:51:10 +00:00
Michael Niedermayer
2a522579aa Minor simplification.
Originally committed as revision 16343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 17:32:11 +00:00
Michael Niedermayer
f78a679177 Remove unused run_start variable.
Originally committed as revision 16342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 17:11:19 +00:00
Michael Niedermayer
6f5c00eb9f Move sync line pointers code to the end of the loop, it is simpler that way.
Originally committed as revision 16341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 17:04:31 +00:00
Michael Niedermayer
e3a54b6694 Get rid of check for condition that is always true (run_off < avctx->width).
Originally committed as revision 16340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:59:10 +00:00
Michael Niedermayer
43ba8f3545 Get rid of pix_left in the 2d code, it is simpler that way.
Originally committed as revision 16339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:57:35 +00:00
Reynaldo H. Verdejo Pinochet
a3636fa033 COSMETICS Part 3 and final of Kenan Gillet's QCELP silence handling patch.
Originally committed as revision 16338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:50:21 +00:00
Reynaldo H. Verdejo Pinochet
4f54fb54e3 Part 2 of Kenan Gillet's QCELP silence handling patch.
Originally committed as revision 16337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:49:06 +00:00
Michael Niedermayer
6fe68c7b97 Factorize "avctx->width + 2" out to avoid someone mistakenly changing
some but not all.

Originally committed as revision 16336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:38:55 +00:00
Michael Niedermayer
621e6525a6 cosmetic (moving pix_left update)
Originally committed as revision 16335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:30:50 +00:00
Michael Niedermayer
1d7985072c Close gaping sechole. That is, a series of run=0 allows arbitrary data to
be written over the end of the runs array.

Originally committed as revision 16334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 16:29:01 +00:00
Michael Niedermayer
d02ab57a5f minor simplification
Originally committed as revision 16333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 15:21:48 +00:00
Michael Niedermayer
66909bc4f1 Merge ff_ccitt_unpack_1d and 2d.
Originally committed as revision 16332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 15:05:12 +00:00
Michael Niedermayer
d68542f019 Ensure that an invalid run terminates the line.
Originally committed as revision 16331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 14:57:42 +00:00
Michael Niedermayer
ec5bdf4989 10l != vs. == (yes, my fault not kostya's).
Originally committed as revision 16330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 14:39:21 +00:00
Michael Niedermayer
679f3fa901 indent
Originally committed as revision 16329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 13:52:07 +00:00
Michael Niedermayer
68d48cc592 Simplify zero run handling in put_line().
Originally committed as revision 16328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 13:51:52 +00:00
Michael Niedermayer
bc0f7a9c75 Avoid negation in put_line().
Originally committed as revision 16327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 13:50:00 +00:00