summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
Commit message (Collapse)AuthorAge
* matroskadec: fix reverted condition to accept combine_plane operationAurelien Jacobs2011-05-24
|
* matroska: cleanup handling of video stereo modeAurelien Jacobs2011-05-24
|
* matroska: switch stereo mode from int to string and add support in the ↵Kirill Gavrilov2011-05-21
| | | | demuxer too
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API.
* | Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'Michael Niedermayer2011-04-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * handle malloc failures in ff_get_wav_headerMax Horn2011-04-14
| | | | | | | | | | | | | | | | | | | | | | ff_get_wav_header is reading data from a WAVE file and then uses it (without validation) to malloc a buffer. It then proceeded to read data into the buffer, without verifying that the allocation succeeded. To address this, change ff_get_wav_header to return an error if allocation failed, and adapted all calling code to handle that error. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-03
| | | | | | | | Use it instead of url_is_streamed and AVIOContext.is_streamed.
* | Revert "matroskadec: set default duration for simple block"Michael Niedermayer2011-03-25
| | | | | | | | | | This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea. This has been implemented differently by aurel already
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: matroskadec: set default duration for simple block When building for MinGW32 disable strict ANSI compliancy. ARM: fix ff_apply_window_int16_neon() prototype configure: check for --as-needed support early ARM: NEON optimised apply_window_int16() ac3enc: NEON optimised shift functions ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min mpeg12.c: fix slice threading for mpeg2 field picture mode. ffmetadec.c: fix compiler warnings. configure: Don't explicitly disable ffplay or in/outdevices on dos configure: Remove the explicit disabling of ffserver configure: Add fork as a dependency to ffserver Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: set default duration for simple blockJohn Stebbins2011-03-25
| | | | | | | | | | | | | | | | | | | | | | When a normal Block is parsed, duration is initialized to AV_NOPTS_VALUE. If it is not changed, then the track's default duration is used. But for SimpleBlock, duration is initialized to 0 instead of AV_NOPTS_VALUE. This is due to the difference in how EBML_NEST vs EBML_PASS are processed. Setting duration to 0 leads eventually to wrongly estimate the frame duration in util.c Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | matroskadec: check that pointers were initialized before accessing themAurelien Jacobs2011-03-24
| | | | | | | | | | | | fix ticket #14 Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-17
|\| | | | | | | | | | | | | | | | | | | 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-16
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: deprecate url_feofAnton Khirnov2011-03-07
| | | | | | | | | | | | 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-04
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lavf: replace all uses of url_fskip with avio_seekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefix for url_fseekAnton Khirnov2011-03-01
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * matroskadec: add generic element length validation.Reimar Döffinger2011-02-06
| | | | | | | | | | | | | | | | | | | | | | | | This validate the length of a mkv element directly after reading it. This has the advantage that it is easy to add new limits and makes it less likely to forget to add checks and also avoids issues like bits of the length value above the first 32 being ignored because the parsing functions only takes an int. Previously discussed in the "mkv 0-byte integer parsing" thread. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | 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.
* | matroskadec: set a default duration also for packets comming from a simple blockAurelien Jacobs2011-03-16
| |
* | Make matroska demuxer also set timestamps for RealAudio packets.Reimar Döffinger2011-03-05
| | | | | | | | | | Improves seeking in ffplay with http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv
* | avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-05
| | | | | | | | | | 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-03
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)
* | avio: avio_ prefix for url_fseekAnton Khirnov2011-03-03
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
* | avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5)
* | avio: avio_ prefixes for get_* functionsAnton Khirnov2011-02-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: move init_put_byte() to a new private header and rename itAnton Khirnov2011-02-20
| | | | | | | | | | | | | | | | init_put_byte should never be used outside of lavf, since sizeof(AVIOContext) isn't part of public ABI. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit e731b8d8729e75bfb69f5540e6446d6118dac549)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | matroskadec: add generic element length validation.Reimar Döffinger2011-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | This validate the length of a mkv element directly after reading it. This has the advantage that it is easy to add new limits and makes it less likely to forget to add checks and also avoids issues like bits of the length value above the first 32 being ignored because the parsing functions only takes an int. Previously discussed in the "mkv 0-byte integer parsing" thread. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 95ec3d4cacd084e2448c3a1aba420e7d8f00e19b)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-28
|/ | | | | | 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)
* matroskadec: skip invalid tags with no TagNameAnton Khirnov2010-11-03
| | | | | | fixes segfault in issue 2328 Originally committed as revision 25659 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add ff_ prefix to metadata_conv()Anton Khirnov2010-10-16
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Export metadata in the generic format. Deprecate old conversion API.Anton Khirnov2010-10-15
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a special function to mkv demxuer to parse length values that includesReimar Döffinger2010-09-06
| | | | | | special-case code to handle all possible encodings of "unknown length". Originally committed as revision 25049 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: allow uint and float elements with length = 0Aurelien Jacobs2010-09-05
| | | | Originally committed as revision 25044 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Optimize/simplify ebml_read_num.Reimar Döffinger2010-09-02
| | | | Originally committed as revision 25026 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: minor simplificationAurelien Jacobs2010-08-17
| | | | | | patch from reimar Originally committed as revision 24804 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: fix integer overflowAurelien Jacobs2010-08-17
| | | | | | patch from reimar Originally committed as revision 24803 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add WebM to the Matroska demuxer name.Alex Converse2010-08-01
| | | | Originally committed as revision 24639 to svn://svn.ffmpeg.org/ffmpeg/trunk
* matroskadec: merge only SSA packets togetherDavid Conrad2010-07-02
| | | | | | | fixes issue 2052 patch by David Conrad Originally committed as revision 24004 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add AV_DISPOSITION_FORCED flag and use it in matroska demuxerAurelien Jacobs2010-07-02
| | | | Originally committed as revision 24003 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 19:14:11 +0000