Commit Graph

181 Commits

Author SHA1 Message Date
Michael Niedermayer df84d7d9bd Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
Untested, i do not have a sample.

Originally committed as revision 20348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-22 18:43:08 +00:00
Michael Niedermayer 83a4d356ef Support non interleaved avi files that have 0<size<sample_size.
(No i do not have a sample its thus also untested)
The new code is also simpler.

Originally committed as revision 20347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-22 18:32:27 +00:00
Aurelien Jacobs e471e3c4a5 Fix playback of strange AVI files with stray LIST.
sample: http://samples.mplayerhq.hu/avi/AV36_1.AVI
fix suggested by Michael

Originally committed as revision 20118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 10:24:02 +00:00
Maksym Veremeyenko 2c14ded386 Fix a bug with reading non-interleaved AVI if one the streams is
shorter.

Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 16:26:24 +00:00
Maksym Veremeyenko b60de406a4 Factorise st->nb_index_entries check.
Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 16:25:12 +00:00
Reimar Döffinger 44ed34b790 Check for seek failures in avi_load_index, otherwise if the index offset
is invalid (e.g. truncated file) we might end up reading the whole file
since trying to seek beyond the end of file does not set EOF.

Originally committed as revision 19709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 08:38:44 +00:00
Maksym Veremeyenko 7305d97f04 Do not read index chunks as audio/video data; closes issue 1336.
patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 19700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 09:46:16 +00:00
Aurelien Jacobs 7a9c86e9f8 avidec: simplify, using av_rescale_q() instead of av_rescale()
Originally committed as revision 19624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 20:53:32 +00:00
Diego Biurrun 18b55f639a Remove pointless '#ifdef DEBUG' around dprintf macro.
Originally committed as revision 19535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-29 17:12:47 +00:00
Måns Rullgård 63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 12:20:04 +00:00
Reimar Döffinger 3dcddf82ed Check for failed extradata malloc, fixes a crash in out-of-memory conditions
or with extremely large extradata.

Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:27:52 +00:00
Reimar Döffinger 5a4a4d7839 Check size of "strf" header against size of enclosing "LIST" if there is one.
Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:26:14 +00:00
Daniel Verkamp 1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
Michael Niedermayer 8c68f25b20 Workaround broken AVI files from DC-XZ6.
Fixes issue897.

Originally committed as revision 18942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 18:28:26 +00:00
Baptiste Coudurier c13b250bad move DEBUG define before include to get dprintf and change printf to dprintf
Originally committed as revision 18932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-24 22:59:25 +00:00
Baptiste Coudurier 876578914b set avi fsize to INT64_MAX if riff tag end is not set and file size is not available
Originally committed as revision 18052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:57:14 +00:00
Michael Niedermayer c60a0f85ee Check for alloc failures.
Originally committed as revision 17497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 20:57:46 +00:00
Michael Niedermayer 8ebe099ac0 Check for EOF during index reading.
Originally committed as revision 17496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 20:44:39 +00:00
Michael Niedermayer f5007cc844 Handle chunks with the MSB in size set correctly that is unsigned.
Originally committed as revision 17491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 20:11:34 +00:00
Michael Niedermayer 31f2616db8 Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
partially fixes issue862.

Originally committed as revision 17475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 15:32:56 +00:00
Peter Ross 1e04bbeede AVI demuxer: return AVERROR_EOF upon detection of end of file.
Originally committed as revision 17456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 12:19:33 +00:00
Måns Rullgård 037c08d6cd avidec: fix error introduced in r17382
Originally committed as revision 17385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 18:52:14 +00:00
Benoit Fouet 87ad63c0f9 Add a context to av_log() calls and modify a function prototype to allow it.
Originally committed as revision 17382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 16:33:00 +00:00
Aurelien Jacobs 5ea7ce8843 modify the way to pass parameters to av_metadata_set()
This improves code readability and this avoid warnings about discarding
qualifiers from pointer target type.

Originally committed as revision 16952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 21:45:55 +00:00
Aurelien Jacobs 2bb6eba21d remove ff_get_fourcc() and use AV_RL32() instead
Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 12:21:01 +00:00
Marc Mason 9d9aac84f6 Make unsigned int a variable that does not need to be explicitely 32 bits.
Fixes a warning.
Patch by: Marc Mason mpeg (your_ad_here) blue (chez) free fr

Originally committed as revision 16632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 14:03:46 +00:00
Aurelien Jacobs 49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 17:19:17 +00:00
Måns Rullgård 7b114c0925 AVI: add bswap.h include needed on big endian
Originally committed as revision 16564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-12 00:07:40 +00:00
Aurelien Jacobs bc1d2afb37 rename AVMetaData to AVMetadata and meta_data to metadata
Originally committed as revision 16430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 23:31:31 +00:00
Michael Niedermayer 47146dfbf6 Generic metadata API.
avi is updated as example.
No version bump, the API still might change slightly ...
No update to ffmpeg.c as requested by aurel.

Originally committed as revision 16424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 18:48:37 +00:00
Michael Niedermayer ca5b528ea1 Fix bug where the avi demxuer lost the first frame of malformed
ODML avis.
Fixes VS2k5DebugDemo-01-partial.avi

Originally committed as revision 16167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 16:14:07 +00:00
Michael Niedermayer a3bb564ee5 10l (forgot sample_size)
Should fix fate.

Originally committed as revision 16133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 20:38:05 +00:00
Michael Niedermayer 25983dcd53 Fix non interleaved variable fps ODML avis.
Fixed issue738

Originally committed as revision 16127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 15:48:48 +00:00
Michael Niedermayer 7ccc636f03 Favor even chunk sizes in ambiguous cases.
Fixes transcode_069_produces_uneven_chunk_size.avi.

Originally committed as revision 15557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:26:43 +00:00
Michael Niedermayer f080a7bd90 Factorize stream id parsing.
Originally committed as revision 15556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 21:57:01 +00:00
Diego Biurrun bc5c918ea8 Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
Luca Abeni dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Aurelien Jacobs 5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
Baptiste Coudurier 62f2523062 change assert test due to the new reducing of time_base in av_set_pts_info, fix #561
Originally committed as revision 14477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 21:07:54 +00:00
Diego Biurrun 15d6e3612f spelling cosmetics
Originally committed as revision 14064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 13:05:06 +00:00
Baptiste Coudurier ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:22:56 +00:00
Baptiste Coudurier ccafd47251 factorize read_header failure freeing code
Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:16:56 +00:00
Florian Echtler 25176d6e22 Parse 'dats' as data.
Patch by Florian Echtler: floe butterbrot org

Originally committed as revision 13801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-18 09:03:38 +00:00
Stefano Sabatini bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Michael Niedermayer fce88d52ca Fixes NULL pointer dereference CID66
Originally committed as revision 13483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 00:10:34 +00:00
Michael Niedermayer 9d4cd3bfd5 Tell the user if a AVI is non interleaved.
Originally committed as revision 13482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 00:07:41 +00:00
Diego Biurrun f4433de9ef consistency cosmetics: indices --> indexes
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:14:25 +00:00
Michael Niedermayer 2be83b96b6 Support non interleaved avi with phantom streams.
Originally committed as revision 13436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 20:29:16 +00:00
Michael Niedermayer 7ce76ee433 Print warning if scale/rate is invalid.
Originally committed as revision 12806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:45:18 +00:00
Michael Niedermayer 0dbb651564 indent
Originally committed as revision 12805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:41:45 +00:00