1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

92 Commits

Author SHA1 Message Date
Peter Ross
1c4ac03530 electronicarts: prevent endless loop opportunity in process_audio_header_elements()
Fixes issue2529.

Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 02:25:12 +00:00
Peter Ross
74093bb593 revert r26302
Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 22:25:45 +00:00
Peter Ross
e19e051e56 electronicarts: prevent endless loop opportunity in process_audio_header_elements()
Fixes issue2529.

Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 12:56:50 +00:00
Peter Ross
42396c2e67 electronicarts: only apply audio sanity checks when audio stream is present
Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 12:51:45 +00:00
Daniel Kang
cb77dad724 perform sanity check on sample rate in electronicarts demuxer
Fixes issue2525
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 11:38:38 +00:00
Daniel Kang
4da766ce65 perform sanity check on number of channels in electronicarts demuxer
Fixes issue2514
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 11:02:07 +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
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +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
Carl Eugen Hoyos
e6a9dd6a7d Use enum CodecID where appropriate.
Originally committed as revision 21119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 08:57:20 +00:00
Peter Ross
add5badbc1 do not create Electronic Arts audio stream when unsupported revision2 audio codec is present [issue1516]
Originally committed as revision 21116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 05:08:42 +00:00
Reimar Döffinger
892d7e78ef Slightly improve probe for ea format by checking that it is possible to
guess whether the file is little- or big-endian.

Originally committed as revision 19896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:07:27 +00:00
Peter Ross
eacfe8581d Electronic Arts demuxer: support Madcow video tag
Originally committed as revision 19179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:20:54 +00:00
Reimar Döffinger
c3481d18b4 Remove unused audio_pts field from ea demuxer struct
Originally committed as revision 18538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-16 12:46:06 +00:00
Reimar Döffinger
c96495e75c Move ea demuxer messages that are irrelevant to ordinary users from
AV_LOG_INFO to AV_LOG_DEBUG.

Originally committed as revision 18464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:53:22 +00:00
Reimar Döffinger
46e97dc3c2 Reindent
Originally committed as revision 18429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 10:41:06 +00:00
Reimar Döffinger
f772b7fa7d Make electronicarts demuxer return partial frames, this is the default
behaviour of av_get_packet and should not be override without good reason.
As a side effect this fixes the memleak described in issue 956.
Also return the exact error code from av_get_packet instead of AVERROR(EIO).

Originally committed as revision 18428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-11 10:38:56 +00:00
Diego Biurrun
b57ac115ae Add av_uninit macro to variable to avoid false positive warning:
libavformat/electronicarts.c: In function ‘ea_read_packet’:
libavformat/electronicarts.c:447: warning: ‘num_samples’ may be used uninitialized in this function

Originally committed as revision 17157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 15:01:52 +00:00
Peter Ross
468d298d0c Electronic Arts demuxer: support TQI video tag
Originally committed as revision 17003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 08:59:38 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
Peter Ross
d2299316ce Electronic Arts demuxer: support TGQ video tags
Originally committed as revision 15791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 00:39:31 +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
Peter Ross
fc7ed9a6f6 Support Electronic Arts files containing MP3 audio.
Originally committed as revision 14824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 12:39:57 +00:00
Peter Ross
ebc22cc29f Electronic Arts demuxer: support SxEN audio tags found in 'Need for Speed: Pro Street' computer game.
Originally committed as revision 14713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 12:36:00 +00:00
Peter Ross
6819af8245 Electronic Arts demuxer: perform identification of ADPCM EA R2 codec using revision2 flag.
Originally committed as revision 14710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:35:09 +00:00
Peter Ross
a07f117804 Electronic Arts demuxer: ignore PTxx platform ID values.
Originally committed as revision 14709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:33:32 +00:00
Peter Ross
d3302b7011 Support Electronic Arts files containing MPEG2VIDEO.
Originally committed as revision 14708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:32:59 +00:00
Peter Ross
d9d9a8c028 Add MDEC tags to Electronic Arts demuxer.
Originally committed as revision 14679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 01:58:46 +00:00
Peter Ross
bbf020e977 Add Electronic Arts TGV chunk tags to EA demuxer.
Originally committed as revision 14643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 08:34:35 +00:00
Peter Ross
af8ed96f45 EA Demuxer: make rev2 flag optional
Originally committed as revision 14474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 07:41:32 +00:00
Peter Ross
b2f181c270 Electronic Arts CMV demuxer
Originally committed as revision 14111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 13:24:13 +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
Carl Eugen Hoyos
696c30688b Fix icc warning #188: enumerated type mixed with another type
Originally committed as revision 13144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:51:37 +00:00
Aurelien Jacobs
725d86bfd5 add pcm_s16le_planar support for electronicarts files
Originally committed as revision 11092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-25 16:32:47 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Aurelien Jacobs
968fc6b96a probe more kind of electronic arts files
Originally committed as revision 10947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 23:01:32 +00:00
Peter Ross
fac84d3c18 EA IMA EACS decoder
original patch by Peter Ross

Originally committed as revision 10880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:20:26 +00:00
Peter Ross
7bb65d8964 EA IMA SEAD decoder
original patch by Peter Ross

Originally committed as revision 10879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:12:18 +00:00
Aurelien Jacobs
97e6ee2064 probe files starting with the 1SNh tag
Originally committed as revision 10861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-25 21:17:39 +00:00
Aurelien Jacobs
94e8c227ba don't use #define with names starting with _
Originally committed as revision 10860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-25 21:10:18 +00:00
Aurelien Jacobs
98168220b0 add parsing of 1SNh header in the EA demuxer
Originally committed as revision 10859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-25 20:38:49 +00:00
Aurelien Jacobs
446263879b avoid infinite loop at the end of files which are not properly terminated
Originally committed as revision 10857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 21:44:20 +00:00
Peter Ross
e758396268 EA ADPCM R1, R2 and R3 decoder
original patch by Peter Ross

Originally committed as revision 10856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 20:49:42 +00:00
Aurelien Jacobs
39fe9d79ad convert a if() into a switch() to ease addition of new tags to probe
Originally committed as revision 10843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 21:06:04 +00:00
Aurelien Jacobs
ab89dbd43e better check for video track detection
Originally committed as revision 10807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:52:08 +00:00
Aurelien Jacobs
018d0ff973 skip unsupported audio track data
Originally committed as revision 10806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:50:52 +00:00
Aurelien Jacobs
a2c9473d96 cosmetics: indentation
Originally committed as revision 10805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:44:05 +00:00
Aurelien Jacobs
c611463fe4 check if we found an audio track before initializing the audio stream
Originally committed as revision 10804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 23:42:54 +00:00