Commit Graph

17078 Commits

Author SHA1 Message Date
Michael Niedermayer
db4fac64db Change AVSubtitle.rects to an array of pointers so ABI does not break
when the size of AVSubtitleRect changes.

Originally committed as revision 16412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 17:54:48 +00:00
Michael Niedermayer
7cf9c6ae40 Display subtitles within the display area.
Fixes dvd-subtitle-problem.vob. (problem likely is that the video
resolution is smaller than what the subtitles expect)

Originally committed as revision 16411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 17:50:00 +00:00
Michael Niedermayer
c66216ed5d Add enum AVSubtitleType
Originally committed as revision 16410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 15:15:03 +00:00
Jason Garrett-Glaser
37fed10087 Add x264 SSE2 iDCT functions to H.264 decoder.
Originally committed as revision 16409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 00:46:17 +00:00
Diego Biurrun
c96da3edc3 Avoid POSIX-reserved _t namespace.
Originally committed as revision 16408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-02 16:21:22 +00:00
Diego Biurrun
0f0b707fa3 Avoid POSIX-reserved _t namespace.
Originally committed as revision 16407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-02 16:19:27 +00:00
Stefano Sabatini
e329b6ec7a Bump year number.
Originally committed as revision 16406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-02 11:09:37 +00:00
Stefano Sabatini
9ce95f272e Cosmetics: break line to make it not longer than 80 chars.
Originally committed as revision 16405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-02 10:07:26 +00:00
Michael Niedermayer
ce0453aac9 10l set AVPacket.size to the true size of the returned data instead of
the (larger) allocated size. (prevents segfaults due to later failures
from 900MB-sized packets, yes fuzzed file not a valid one)

Originally committed as revision 16404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-31 02:47:54 +00:00
Michael Niedermayer
188e67eaf4 Fix indention which was off by 1 space.
Originally committed as revision 16403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-31 01:54:54 +00:00
Michael Niedermayer
0b4ff0c9ef Replace buffer by AVPacket and avoid a memcpy() for video when the number
of allocated slices matches the actual.
Audio still does a copy (marked with FIXME in the code so this is not missed).

Originally committed as revision 16402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-31 01:53:12 +00:00
Michael Niedermayer
fce48f5b0b Merge videobuf and audiobuf.
Originally committed as revision 16401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-31 00:24:54 +00:00
Michael Niedermayer
f48d545736 Simplify the top of rm_assemble_video_frame().
Originally committed as revision 16400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 21:23:02 +00:00
Michael Niedermayer
e45673cb3a Add a few error checks to rm_assemble_video_frame()
Originally committed as revision 16399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 20:51:18 +00:00
Michael Niedermayer
51d6852f43 All non zero returns of rm_assemble_video_frame() are errors, check things
accordingly.

Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 19:49:27 +00:00
Carl Eugen Hoyos
aed464654b Silence two icc warnings:
/home/melanson/fate/source/ffserver.c(4349):
warning #188: enumerated type mixed with another type
                          audio_enc.codec_id = audio_id;
                                             ^

/home/melanson/fate/source/ffserver.c(4354):
warning #188: enumerated type mixed with another type
                          video_enc.codec_id = video_id;
                                             ^

Originally committed as revision 16397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 12:02:35 +00:00
Benoit Fouet
9d705050c1 Add my GnuPG fingerprint.
Originally committed as revision 16396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 08:47:52 +00:00
Måns Rullgård
172a39d13c ARM: work around linker bug with movw/movt relocations in shared libs
Originally committed as revision 16395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 03:13:52 +00:00
Måns Rullgård
2e35e68434 Make shared/static full CONFIG options
Originally committed as revision 16394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 03:13:48 +00:00
Måns Rullgård
ab5cb08492 configure: check for ARMv6T2 support
Originally committed as revision 16393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 03:13:44 +00:00
Måns Rullgård
77e2249e2f ARM: rename coefficient table in NEON IDCT
Originally committed as revision 16392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-30 03:13:40 +00:00
Aurelien Jacobs
275131628d Remove duplicated dot product code. Use dsputil's
scalarproduct instead. Patch by Aurelien Jacobs.

Originally committed as revision 16391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 17:14:30 +00:00
Reimar Döffinger
0a11fc82ae My gpg key fingerprint.
Originally committed as revision 16390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 16:56:02 +00:00
Reynaldo H. Verdejo Pinochet
6c8f2def73 COSMETICS. Write my full name instead.
Originally committed as revision 16389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 16:39:11 +00:00
Reynaldo H. Verdejo Pinochet
3bb79c0413 Add myself as qcelp* maintainer.
Originally committed as revision 16388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 16:33:03 +00:00
Reynaldo H. Verdejo Pinochet
f1e27baeb2 Add my key fingerprint to the list.
Originally committed as revision 16387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 16:27:57 +00:00
Måns Rullgård
c51fafa13f configure: accept $TMP as location for temporary files
Originally committed as revision 16386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 12:55:28 +00:00
Måns Rullgård
a49d42c24e configure: simplify TMPDIR setting
Originally committed as revision 16385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 12:55:24 +00:00
Stefano Sabatini
91535e5f38 Fix typos.
Originally committed as revision 16384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 12:11:01 +00:00
Michael Niedermayer
45a92230e1 Clarify that the list of gpg fingerprints is not just for maintainers.
Originally committed as revision 16383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 12:00:38 +00:00
Michael Niedermayer
234ccf193f Add spaces into the gpg fingerprint for better readability.
Originally committed as revision 16382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 11:57:52 +00:00
Kostya Shishkov
592beefe99 It turned out that RV30 uses motion vectors for forward motion B-frame
macroblocks to predict motion vectors for backward motion B-frame macroblocks
and vice versa.

Originally committed as revision 16381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-29 10:20:03 +00:00
Michael Niedermayer
e4f1ec3a4c Explain the lack of +3/7
Originally committed as revision 16380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 23:26:12 +00:00
Reimar Döffinger
7d204e67e8 av_free() -> av_freep(), patch by Reimar Doffinger, see discussion in
"rmdec.c: double free" thread on mailinglist.

Originally committed as revision 16379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 23:25:17 +00:00
Ronald S. Bultje
c49a3ec30a Fix double free which happens for playback of .rm files after r16365. See
"rmdec.c: double free" discussion on mailinglist, patch with suggestions
from Reimar Doffinger.

Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 23:23:59 +00:00
Michael Niedermayer
133e5c4026 Add a list of GnuPG fingerprints.
This is not as good as personal keysigning (ala debian) but better than
nothing.

Originally committed as revision 16377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 23:12:46 +00:00
Carl Eugen Hoyos
6735e2c810 Revert r16375: It broke aac decoding.
Originally committed as revision 16376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 20:08:39 +00:00
Carl Eugen Hoyos
69b38d4dc3 Reduce number of warnings when compiling with icc by two.
Originally committed as revision 16375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-28 19:48:43 +00:00
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