summaryrefslogtreecommitdiff
path: root/libavformat/electronicarts.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use designated initialisers for all (de)muxers.Anton Khirnov2011-07-171-6/+6
| | | | | | | | It's more readable and less prone to breakage.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Use av_set_pts_info to set time_base.Reimar Döffinger2011-04-161-3/+2
| | | | | | | | | | Also remove useless assignments of 0, the priv context is initialized to 0.
* | Enable header parsing for MPEG2VIDEO to get time-stamps.Reimar Döffinger2011-04-161-0/+3
| | | | | | | | | | | | FFmpeg can generate pts and dts on its own, but only if we enable parsing, so do that. This fixes ticket #46.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-171-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes senseAnton Khirnov2011-03-161-9/+9
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-071-2/+2
| | | | | | | | | | | | AVIOContext.eof_reached should be used directly instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-041-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-011-7/+7
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-011-5/+5
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-211-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-8/+8
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-051-1/+1
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
* | lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-031-7/+7
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
* | avio: avio_ prefix for url_fseekAnton Khirnov2011-03-031-5/+5
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-221-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: get_byte -> avio_r8 get_<type> -> avio_r<type> get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-201-8/+8
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* electronicarts: prevent endless loop opportunity in ↵Peter Ross2011-01-111-2/+2
| | | | | | | | process_audio_header_elements() Fixes issue2529. Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
* revert r26302Peter Ross2011-01-101-2/+0
| | | | Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
* electronicarts: prevent endless loop opportunity in ↵Peter Ross2011-01-101-0/+2
| | | | | | | | process_audio_header_elements() Fixes issue2529. Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
* electronicarts: only apply audio sanity checks when audio stream is presentPeter Ross2011-01-101-10/+11
| | | | Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
* perform sanity check on sample rate in electronicarts demuxerDaniel Kang2011-01-101-0/+5
| | | | | | | Fixes issue2525 Original patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
* perform sanity check on number of channels in electronicarts demuxerDaniel Kang2011-01-101-0/+5
| | | | | | | Fixes issue2514 Original patch by Daniel Kang, daniel.d.kang at gmail Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to bswap macrosMåns Rullgård2010-07-101-1/+1
| | | | Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-311-2/+2
| | | | | | Patch by Jean-Daniel Dupas, devlists shadowlab org Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-2/+2
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use enum CodecID where appropriate.Carl Eugen Hoyos2010-01-101-1/+1
| | | | Originally committed as revision 21119 to svn://svn.ffmpeg.org/ffmpeg/trunk
* do not create Electronic Arts audio stream when unsupported revision2 audio ↵Peter Ross2010-01-101-0/+1
| | | | | | codec is present [issue1516] Originally committed as revision 21116 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Slightly improve probe for ea format by checking that it is possible toReimar Döffinger2009-09-171-2/+6
| | | | | | guess whether the file is little- or big-endian. Originally committed as revision 19896 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Electronic Arts demuxer: support Madcow video tagPeter Ross2009-06-131-0/+9
| | | | Originally committed as revision 19179 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused audio_pts field from ea demuxer structReimar Döffinger2009-04-161-2/+0
| | | | Originally committed as revision 18538 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ea demuxer messages that are irrelevant to ordinary users fromReimar Döffinger2009-04-121-13/+13
| | | | | | AV_LOG_INFO to AV_LOG_DEBUG. Originally committed as revision 18464 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentReimar Döffinger2009-04-111-22/+22
| | | | Originally committed as revision 18429 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make electronicarts demuxer return partial frames, this is the defaultReimar Döffinger2009-04-111-8/+4
| | | | | | | | 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
* Add av_uninit macro to variable to avoid false positive warning:Diego Biurrun2009-02-111-1/+1
| | | | | | | 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
* Electronic Arts demuxer: support TQI video tagPeter Ross2009-02-051-0/+6
| | | | Originally committed as revision 17003 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* Fix build: Add intreadwrite.h and bswap.h #includes where necessary.Diego Biurrun2009-01-111-0/+1
| | | | Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Electronic Arts demuxer: support TGQ video tagsPeter Ross2008-11-081-0/+9
| | | | Originally committed as revision 15791 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bump Major version, this commit is almost just renaming bits_per_sample toLuca Abeni2008-09-081-3/+3
| | | | | | | | | | | 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
* Support Electronic Arts files containing MP3 audio.Peter Ross2008-08-181-2/+10
| | | | Originally committed as revision 14824 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Electronic Arts demuxer: support SxEN audio tags found in 'Need for Speed: ↵Peter Ross2008-08-121-0/+7
| | | | | | Pro Street' computer game. Originally committed as revision 14713 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Electronic Arts demuxer: perform identification of ADPCM EA R2 codec using ↵Peter Ross2008-08-121-0/+1
| | | | | | revision2 flag. Originally committed as revision 14710 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Electronic Arts demuxer: ignore PTxx platform ID values.Peter Ross2008-08-121-1/+1
| | | | Originally committed as revision 14709 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support Electronic Arts files containing MPEG2VIDEO.Peter Ross2008-08-121-0/+5
| | | | Originally committed as revision 14708 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add MDEC tags to Electronic Arts demuxer.Peter Ross2008-08-101-0/+25
| | | | Originally committed as revision 14679 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status