Mans Rullgard
3e8c4f9689
avidec: make print_tag() a macro and remove related ifdefs
...
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6081f8c4e2
)
2011-01-26 03:43:30 +01:00
Peter Ross
456a70aeb8
add ff_get_bmp_header
...
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26 01:23:44 +00:00
Aurelien Jacobs
8ba5bf5a7c
avidec: read some of the Nikon specific tags produced by Nikon cameras
...
Originally committed as revision 25821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-24 20:53:27 +00:00
Aurelien Jacobs
73d0e33102
avidec: support non-standard creation_time format
...
Originally committed as revision 25815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 12:04:50 +00:00
Aurelien Jacobs
d35cdd5719
avidec: trivial simplification regarding av_metadata_set
...
Originally committed as revision 25814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 12:03:23 +00:00
Aurelien Jacobs
933875a0f5
avidec: export creation_date as metadata
...
Originally committed as revision 25785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 19:00:07 +00:00
Anton Khirnov
03700d399b
Export metadata in the generic format. Deprecate old conversion API.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 19:04:25 +00:00
Carl Eugen Hoyos
2b50c4f6cc
Cosmetics: Reindent after r25023.
...
Originally committed as revision 25024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-02 11:53:09 +00:00
Andrew Wason
4ed899f2c5
Fix crash when decoding DV in AVI introduced in r24579 (issue 2174).
...
Patch by Andrew Wason, rectalogic rectalogic com
Originally committed as revision 25023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-02 11:51:32 +00:00
Aurelien Jacobs
f138fa78a3
100l: av_freep() needs the address of the pointer
...
Originally committed as revision 24613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 23:41:12 +00:00
Aurelien Jacobs
37287d41f4
avidec: demux ASS and SRT tracks out of GAB2 chunks
...
Originally committed as revision 24579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-29 22:17:30 +00:00
Jai Menon
bbfb2c8077
avidec : Free packet if dv_produce_packet fails.
...
Originally committed as revision 24281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 05:40:18 +00:00
Jai Menon
a58e6ceae0
avidec : Free codec context before initializing the chained DV demuxer.
...
Originally committed as revision 24279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 05:08:01 +00:00
Måns Rullgård
8fc0162ac4
Add av_ prefix to bswap macros
...
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
Michael Niedermayer
9862f9e149
Disable dshow specific bug emulation for amv files as they arent
...
demuxed by ms dshows buggy demuxer normally.
Originally committed as revision 24012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 23:39:02 +00:00
Michael Niedermayer
89ac23cd40
Rename block_align variable in the avi demuxer to clearly seperate its purpose
...
from the true block_align.
Originally committed as revision 24011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 23:33:10 +00:00
Michael Niedermayer
d01144b9d3
Duplicate rounding that MS does in one of their implementations of an avi demuxer.
...
Fixes issue740
Based on patch by Cory Fields theuni-nospam- >xbmc @org
Originally committed as revision 23999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 15:09:27 +00:00
Michael Niedermayer
8a472821a4
Factorize get_duration() out of 4 places of the avi demuxer.
...
Originally committed as revision 23934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 13:50:15 +00:00
Michael Niedermayer
0c0fd063dd
Prevent infinite recursion of odml indexes.
...
This fixes a stack overflow.
Originally committed as revision 23925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 00:09:08 +00:00
Michael Niedermayer
fbfccc0404
Disable non interleaved avi code when there is no index available.
...
Fixes issue1956.
Originally committed as revision 23202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-20 18:34:44 +00:00
Thierry Foucu
e1954bb5ca
Do not use pkt->size when it is potentially uninitialized.
...
Patch by Thierry Foucu, tfoucu gmail
Originally committed as revision 23017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-04 17:17:16 +00:00
Sebastian Vater
bf29cbc2cc
Change a %2 to &1. Patch by Sebastian Vater <cdgs DOT basty googlemail com>.
...
Originally committed as revision 22922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 17:05:02 +00:00
Jean-Daniel Dupas
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Reimar Döffinger
28eb577390
Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in
...
huge processing and memory usage overhead for avi files with raw PCM audio.
Originally committed as revision 22521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 13:38:00 +00:00
Anton Khirnov
04d2540c4b
Add AVI metadata conversion table.
...
Patch by Anton Khirnov (gmail{wyskas}).
Originally committed as revision 21653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-06 12:32:44 +00:00
Michael Niedermayer
7a9af8ec19
Support strn tag in avidec.
...
Originally committed as revision 21643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 12:16:59 +00:00
Michael Niedermayer
1ac0893799
Correcting wrong looking stream_id validity check in avidec.
...
Originally committed as revision 21642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 11:50:44 +00:00
Michael Niedermayer
3c8d75e65b
Only set duration for streams where it is likely correct.
...
Fixes issue1120
Originally committed as revision 21620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 00:35:10 +00:00
Michael Niedermayer
bce8840a4e
Set nb_frames.
...
Also add DXSA tag (commited by mistake in this commit, i can revert and recommit
seperately if someone wants)
Originally committed as revision 21619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 23:53:38 +00:00
Carl Eugen Hoyos
0941ee0fa6
Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
...
Originally committed as revision 21154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 00:29:26 +00:00
Michael Niedermayer
12ad66712a
Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
...
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.
Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:27:29 +00:00
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