summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
Commit message (Collapse)AuthorAge
* Remove unused variables.Reimar Döffinger2011-05-07
|
* avidec: correct frame_offset for seekingMichael Niedermayer2011-05-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avidec: detect mpeg4 keyframes in indexless aviMichael Niedermayer2011-05-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Make DV (sub) demuxer set proper pkt->pos values.Reimar Döffinger2011-05-02
| | | | | This makes the avi demuxer create packets with proper pos values with the file from ticket #140.
* Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces.Reimar Döffinger2011-04-30
| | | | Fixes ticket #140.
* AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer ↵Michael Niedermayer2011-04-30
| | | | | | specific options) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: graphparser: add a NULL check on the argument passed to strstr setdar: prefer "sar" over "par" in log info message fade: fix draw_slice() check on fade->factor value fade: make draw_slice() chroma check against planes 1 and 2 win32: include the correct header in cmdutils.c ac3: fix memleak in fixed-point encoder flashsv: Return more meaningful error values. flashsv: Employ explicit AVCodec struct initializers. read AVI palette from the end of extradata cosmetics: K&R coding style and more whitespace for Flash Screen Video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * read AVI palette from the end of extradataKostya Shishkov2011-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Official AVI specification says that stream header in case of video contains BITMAPINFO, which is equal to BITMAPINFOHEADER and optional palette. Currently lavf AVI demuxer thinks otherwise which produces garbage on codecs that have both palette and extradata (luckily, there are not so many such codecs). An example of such file is: http://samples.multimedia.cx/V-codecs/KMVC/baseball1.avi (IIRC, MSS1 or MSS2 also had such situation but they are still not supported by lavc). As a side note, passing palette in extradata as it's been done previously is not quite correct since proper _extra_ data is surplus bytes in BITMAPINFOHEADER, not including palette. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Do not set non_interleaved for DV-in-AVI.Reimar Döffinger2011-04-25
| | | | | | | | | | | | | | | | | | | | It does not make sense (DV is interleaved by design) and it avoids a crash when the non-interleaved code tries to use the priv_data of streams created by the DV demuxer. The crash could be avoided differently, but then that stream would still lack an index and would not play correctly in non-interleaved mode. Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi
* | avi: try to synchronize the points in time of the starts of streams after ↵Michael Niedermayer2011-04-24
| | | | | | | | | | | | seeking. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add flag to force demuxers to sort more strictly by dts.Michael Niedermayer2011-04-24
| | | | | | | | | | | | | | | | This enables non interleaved AVI mode for example. Players that are picky on strict interleaving can set this. Patches to only switch to non intereaved AVI mode when the index is not strictly correctly interleaved are welcome. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 10l, commit that should have been stashed into the merge.Michael Niedermayer2011-04-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace more FFmpeg references by Libav.Diego Biurrun2011-04-17
| |
| * make containers pass palette change in AVPacketKostya Shishkov2011-04-15
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | 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-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.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Reimplement stream probe try #2Michael Niedermayer2011-04-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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: avio_ prefix for url_fsizeAnton Khirnov2011-03-07
| | | | | | | | 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_ 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: rename av_alloc_put_byte -> avio_alloc_context for consistencyAnton Khirnov2011-02-21
| | | | | | | | 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>
| * avidec: simplify read_gab2_subAnton Khirnov2011-02-06
| | | | | | | | | | | | | | | | | | | | Use avio functions instead of bytestream ones (also drops dependency on lavc and removes a bunch of warnings). Drop custom version of avio_get_str16 and use that instead. Tested on mewmew-ssa.avi sample. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Remove forgotten if (p) av_free(p) formsClément Bœsch2011-02-04
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * 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.
| * avidec: make print_tag() a macro and remove related ifdefsMans Rullgard2011-01-25
| | | | | | | | | | | | | | 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>
* | avio: avio_ prefix for url_fsizeAnton Khirnov2011-03-08
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* | 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_ 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: rename av_alloc_put_byte -> avio_alloc_context for consistencyAnton Khirnov2011-02-22
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8d9ac969cb4ac3e3e18f6425703af4d7aec6c513)
* | avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
* | avidec: simplify read_gab2_subAnton Khirnov2011-02-09
| | | | | | | | | | | | | | | | | | | | | | Use avio functions instead of bytestream ones (also drops dependency on lavc and removes a bunch of warnings). Drop custom version of avio_get_str16 and use that instead. Tested on mewmew-ssa.avi sample. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 47fdf00a77e82a0e30422ed08d5b295e9ae8d506)
* | Remove forgotten if (p) av_free(p) formsClément Bœsch2011-02-06
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 290849e2a4e76484f1a34506782e8dbfe7bbe406)
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | 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)
* | avidec: make print_tag() a macro and remove related ifdefsMans Rullgard2011-01-26
|/ | | | | | | | 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 6081f8c4e283bf1b33e4cf4b2ca44217219f9210)
* add ff_get_bmp_headerPeter Ross2010-12-26
| | | | Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
* avidec: read some of the Nikon specific tags produced by Nikon camerasAurelien Jacobs2010-11-24
| | | | Originally committed as revision 25821 to svn://svn.ffmpeg.org/ffmpeg/trunk