virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
27,092 Commits 37 Branches 400 Tags 458 MiB
1ba44140a3
Commit Graph

27092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Kang
1ba44140a3 Fix crash for files with strip size larger than the buffer. 
Fixes issue 2498.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26243 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 14:44:50 +00:00
Carl Eugen Hoyos
504530bfba Set blkalign to 3840 (maximum bytes per frame) for AC-3 in avi. 
Fixes playback for corner-cases like 32kHz 320kb.

Originally committed as revision 26242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 13:30:32 +00:00
Martin Storsjö
79d482b108 rtpdec: Don't set RTP timestamps if they already are set by the depacketizer 
For MS-RTSP, we don't always get RTCP packets (never?), so the earlier
timestamping code never wrote anything into pkt->pts. The rtpdec_asf
depacketizer just sets the dts of the packet, so if the generic RTP
timestamping is used, too, we get inconsistent timestamps.

Therefore, skip the generic RTP timestamp algorithm if the depacketizer
already has set something.

This fixes "Invalid timestamps" warnings, present since SVN rev 26187.

Originally committed as revision 26241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 11:33:06 +00:00
Daniel Kang
6cbce63650 Fix assertion fail on audio files with invalid sample rates, 
fixes issue 2475.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 03:30:19 +00:00
Stefano Sabatini
6bbdba08c2 Revert previous commit, as it was not meant to be pushed. 
Originally committed as revision 26239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:11:57 +00:00
Stefano Sabatini
7820147e6f Issue more explicit error messages in compute_pkt_fields2(). 
Originally committed as revision 26238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:01:21 +00:00
Stefano Sabatini
81bd411965 In av_close_input_stream(), flush the packet queue before to actually 
close the stream.

This way the flushed packets can still reference the still unclosed
format context.

In particular this fixes a spurious error issued when closing the
video4linux2 buffer in mmap_release_buffer(), which tries to access
the file descriptor of an already closed file.

Originally committed as revision 26237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:01:14 +00:00
Martin Storsjö
29db7c3af4 rtsp: Parse RTP-Info headers 
Originally committed as revision 26236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:23:42 +00:00
Martin Storsjö
4cb06874c7 Reindent 
Originally committed as revision 26235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:23:12 +00:00
Martin Storsjö
91d96bd3c0 rtsp: Simplify code 
Originally committed as revision 26234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:22:50 +00:00
Martin Storsjö
1726813f13 rtsp: Move resetting of rtpdec parameters to before sending the PLAY request 
Originally committed as revision 26233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:22:15 +00:00
Justin Ruggles
ac05f9030e Convert floating-point MDCT coefficients to 24-bit fixed-point all at once 
instead of doing it separately in 2 different functions.
This makes float AC-3 encoding approx. 3-7% faster overall.
Also, the coefficient conversion can now be easily SIMD-optimized.

Originally committed as revision 26232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 20:35:36 +00:00
Vitor Sessak
87c1410d11 Add a FATE test for Playstation STR version 3 
Originally committed as revision 26231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:53:16 +00:00
Vitor Sessak
6e16398aa3 Make dc_lum_vlc and dc_chroma_vlc non-static symbols, 
this fixed the decoding of version 3 PSX MDEC files.

Originally committed as revision 26230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:38:42 +00:00
Baptiste Coudurier
ab04337464 In ogg muxer, correctly mux VFR streams, fix issue #2398 
Originally committed as revision 26229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:32:45 +00:00
Baptiste Coudurier
5e2202d6f3 In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490 
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:21:04 +00:00
Baptiste Coudurier
4af7166fb4 In mov demuxer, check that stts data exists, fix crash, issue #2479 
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:14:44 +00:00
Justin Ruggles
9be52d48d9 Use local variables outside the inner loop in extract_exponents() to reduce 
accessing of structs and arrays inside the loop.
Approx. 30% faster in function extract_exponents().

Originally committed as revision 26226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 16:02:08 +00:00
Stefano Sabatini
5d3d238f82 Factorize common code in v4l2_set_parameters(). 
Originally committed as revision 26225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 14:15:13 +00:00
Stefano Sabatini
8621a37d9f In video4linux2, in the case the timebase value in ap is 0/0, read the 
timebase value already set in the driver, and set it back in the codec
stream, rather than leaving the invalid value of 0/0.

In particular, fix ffmpeg grabbing timestamps when the timebase value
is not set through the CLI.

Originally committed as revision 26224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 14:15:11 +00:00
Stefano Sabatini
2d777bb7a2 Make mpeg4 encoder log a more explicit error message when the timebase 
is not valid.

Originally committed as revision 26223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 11:36:43 +00:00
Robert Swain
ccbbeeee97 Add my GPG fingerprint to the MAINTAINERS file 
Originally committed as revision 26222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 08:03:39 +00:00
Daniel Verkamp
73f6d31e6c Win32 support for av_file_map() 
Originally committed as revision 26221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 05:16:33 +00:00
Michael Niedermayer
db61329607 Our ljpeg encoder supports bgra, use the correct constant in the sanity check. 
Originally committed as revision 26220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 04:52:35 +00:00
Michael Niedermayer
b26847b710 Fix/cleanup m/ljpeg encoding pix fmt selection code in ffmpeg.c. 
Better ideas are welcome ...

Originally committed as revision 26219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 04:52:32 +00:00
Michael Niedermayer
dc8465a9b4 Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ... 
Originally committed as revision 26218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 04:52:21 +00:00
Baptiste Coudurier
69057b70f7 In pad filter, update new ref w/h in start_frame, fix chaining 
Originally committed as revision 26217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 01:14:14 +00:00
Baptiste Coudurier
d34a77fb09 In crop filter, update new ref w/h instead of old one, fix chaining 
Originally committed as revision 26216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 01:00:53 +00:00
Michael Niedermayer
e27bf2c70c Fix YUV444P LJPEG encoding. 
Originally committed as revision 26215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 18:57:16 +00:00
Stefano Sabatini
bd7d9e45a4 In the video4linux2 output device, log an error description in case of 
ioctl failure in mmap_release_buffer().

Originally committed as revision 26214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 18:18:01 +00:00
Stefano Sabatini
44b2784fb4 Remove unnecessary dependency of ffprobe and ffserver on libswscale. 
Originally committed as revision 26213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 14:00:10 +00:00
Stefano Sabatini
be4876eae9 Disable initialization of the swscale sws_opts context in 
cmdutils.c:init_opts(), in the case libswscale compilation is not
enabled.

Fix ffprobe and ffserver compilation with --disable-swscale.

Originally committed as revision 26212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 14:00:06 +00:00
Anton Khirnov
14fa75eab4 lavf: rename meta.h->ffmeta.h for consistency. 
Originally committed as revision 26211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 12:35:39 +00:00
Justin Ruggles
f1cbbb79bf cosmetics: fix typo in previous commit 
Originally committed as revision 26210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 12:08:10 +00:00
Justin Ruggles
6fd96d1a85 Change the AC-3 encoder to use floating-point. 
Fixed-point AC-3 encoder renamed to ac3_fixed.
Regression test acodec-ac3 renamed to acodec-ac3_fixed.
Regression test lavf-rm changed to use ac3_fixed encoder.

Originally committed as revision 26209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 11:53:44 +00:00
Peter Ross
6780f48846 wtv: obtain codec information from stream2_guid chunks, if present 
Originally committed as revision 26208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 11:38:29 +00:00
Aurelien Jacobs
4f18f1b089 mpeg4videodec: reset time_base.num to 0 when detecting time_base.den=0 
to avoid leaving time_base in a broken/inconsistent state
fix issue2471

Originally committed as revision 26207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-03 23:33:20 +00:00
Justin Ruggles
ad6b2c1f6d Move fixed-point parts of the AC-3 encoder to separate files. 
Originally committed as revision 26206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-03 16:08:56 +00:00
Martin Storsjö
f03424a782 Reindent 
Originally committed as revision 26205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-03 12:43:48 +00:00
Daniel Kang
004357a11f Fix compilation on x86-32 with --disable-optimizations, 
fixes issue 2127.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-03 11:30:04 +00:00
Carl Eugen Hoyos
ba76378393 libavfilter does not depend on libswscale, only the scale filter does. 
Originally committed as revision 26203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-03 10:56:37 +00:00
Daniel Kang
3b99e00c75 Fix crash decoding broken wmv2 files. 
Fixes issue 1670.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 23:41:02 +00:00
Aurelien Jacobs
f5dd1eb7b5 srtdec: ensure we don't read 1 byte after buffer end if the buffer is not 
properly terminated.

Originally committed as revision 26201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 23:40:30 +00:00
Carl Eugen Hoyos
6734f2c89e "Fix" compilation with --disable-swscale. 
Originally committed as revision 26200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 16:24:19 +00:00
Anssi Hannula
ef2b2243dc Use AVOption for muxers in ffmpeg. 
Patch by Anssi Hannula, anssi d hannula d iki d fi

Originally committed as revision 26199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 16:00:47 +00:00
Vitor Sessak
815495f040 Remove the "-idct simple" command line option from the fate-psx-str test, 
it should not be necessary anymore.

Originally committed as revision 26198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 12:42:49 +00:00
Peter Ross
17e33f662a wtv: display warning if scrambled stream is detected 
Originally committed as revision 26197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 11:17:34 +00:00
Vitor Sessak
e3e3c82555 Make PSX MDEC decoder output YUVJ420 and always use IDCT_SIMPLE. This 
makes the output much closer to original Playstation hardware.

Originally committed as revision 26196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 11:16:21 +00:00
Anssi Hannula
cf99e4aa00 Add AVOption support for muxers. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:52:34 +00:00
Anssi Hannula
febd72be65 Use new function put_nbyte() to speed up padding. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:46:50 +00:00