summaryrefslogtreecommitdiff
path: root/libavformat/bink.c
Commit message (Collapse)AuthorAge
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-17
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffserver: remove unused variable. Remove unused and outdated TODO file. gitignore: Drop individual .d ignore; it is already covered by a wildcard. lavf: deprecate AVStream.quality. bink: pass Bink version to audio decoder through extradata instead of codec_tag. libpostproc: Remove disabled code. flashsv: improve some comments and fix some wrong ones flashsv: Eliminate redundant variable indirection. flashsv: set reference frame type to full frame flashsv: replace bitstream description by a link to the specification flashsv: convert a debug av_log into av_dlog flashsv: simplify condition flashsv: return more meaningful error values flashsv: cosmetics: break some overly long lines flashsv: cosmetics: drop some unnecessary parentheses swscale: amend documentation to mention use of native depth for scaling. eval: add missing comma to tests. eval: fix memleak. H.264: make loopfilter bS const where applicable Conflicts: libavcodec/binkaudio.c libavformat/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bink: pass Bink version to audio decoder through extradata instead of codec_tag.Kostya2011-07-06
| | | | | | | | | | | | | | This is needed because not all players (e.g. MPlayer) are able to distinguish two different Bink audio decoders when codec_tag is set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix bink audio playback outside of FFmpeg.Ivan Kalvachev2011-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 2 known Bink audio codecs. Additionally they have a different flavor if they are found inside Bink-b "BIKb" file. In order to guess the correct flavor, the demuxer sets the audio codec_tag to be the same as the file format tag. This causes problem because same tag is used for both audio codecs. The hack works in FFmpeg because audio codecs are identified by their codec_id, but other players rely on standard behavior. This fix removes the codec_tag hack and instead uses artificial extradata format to signal the codec flavor. This would also allow proper embedding of Bink audio in other containers. Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* 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>
* 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>
* bink: decode audio track identifiers into AVStream.idPeter Ross2011-02-25
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* bink: set audio stream codec_tag such that binkaudio decoder can identify ↵Peter Ross2011-02-25
| | | | | | bitstream version 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 ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | 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.
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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-31
| | | | | | 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-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prevent memory leak introduced in r22389 in Bink demuxer: pass partial ↵Peter Ross2010-03-11
| | | | | | packets to decoder. Originally committed as revision 22468 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ensure Bink demuxer returns AVERROR code when av_get_packet() failsPeter Ross2010-03-09
| | | | Originally committed as revision 22389 to svn://svn.ffmpeg.org/ffmpeg/trunk
* handle errors reported by av_get_packet() in Bink demuxerPeter Ross2010-03-04
| | | | Originally committed as revision 22208 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Guard against invalid memory readPeter Ross2010-03-04
| | | | Originally committed as revision 22207 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support demuxing of streamed Bink filesPeter Ross2010-03-03
| | | | Originally committed as revision 22166 to svn://svn.ffmpeg.org/ffmpeg/trunk
* low-complexity Bink file seekingPeter Ross2010-02-24
| | | | Originally committed as revision 22022 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set AVINDEX_KEYFRAME correctly for binkPeter Ross2010-02-24
| | | | Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set video stream duration for Bink demuxerPeter Ross2010-02-23
| | | | Originally committed as revision 21996 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bink audio pts starts at 0, not reported_sizePeter Ross2010-02-23
| | | | Originally committed as revision 21994 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make Bink demuxer pass video flags to decoderKostya Shishkov2010-02-23
| | | | Originally committed as revision 21978 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make Bink demuxer skip all zero audio tracks, not only the first oneKostya Shishkov2010-02-19
| | | | Originally committed as revision 21908 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bink video codec id is there, demuxer can use itKostya Shishkov2010-01-31
| | | | Originally committed as revision 21574 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bink demuxerPeter Ross2010-01-31
Originally committed as revision 21569 to svn://svn.ffmpeg.org/ffmpeg/trunk