summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* 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>
* | Set start_time to 0 for raw audio files.Reimar Döffinger2011-04-25
| | | | | | | | | | None of the raw audio files have timestamps, thus setting start_time to 0 should be reasonable.
* | 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
* | Set channel layout for 4 and 5.1 channel cdata audio filesPeter Ross2011-04-25
| | | | | | | | | | | | Patch from Carl Eugen Hoyos (cehoyos at ag dot or dot at) Signed-off-by: Peter Ross <pross@xvid.org>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbisdec: Employ proper printf format specifiers for uint_fast32_t. applehttp: Don't export variant_bitrate if it isn't known crypto: Use av_freep instead of av_free configure: Add missing libm library dependencies to .pc files. oggdec: reindent after 8f3eebd6 configure: Add missing libavutil inter-library dependencies to .pc files. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * applehttp: Don't export variant_bitrate if it isn't knownMartin Storsjö2011-04-24
| | | | | | | | | | | | | | | | If there are no variants, the total bitrate of the single stream isn't known, and exporting variant_bitrate = 0 does look weird, since there really aren't any variants. Signed-off-by: Martin Storsjö <martin@martin.st>
| * crypto: Use av_freep instead of av_freeMartin Storsjö2011-04-24
| | | | | | | | | | | | Using av_freep is generally good practice. Signed-off-by: Martin Storsjö <martin@martin.st>
| * oggdec: reindent after 8f3eebd6Clément Bœsch2011-04-24
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Support fourcc MMJP.Carl Eugen Hoyos2011-04-25
| | | | | | | | Fixes ticket #107.
* | Support fourcc XVIX.Carl Eugen Hoyos2011-04-25
| | | | | | | | Fixes ticket #106.
* | Support fourcc M263.Carl Eugen Hoyos2011-04-25
| | | | | | | | Fixes ticket #103.
* | Support fourcc auv2.ami_stuff2011-04-25
| | | | | | | | Fixes ticket #101.
* | 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>
* | Fix some passing argument from incompatible pointer type warnings.Michael Niedermayer2011-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | HAM6/HAM8 support for IFF demuxer/decoderSebastian Vater2011-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | EA cdata demuxer: support files with 20 byte headerPeter Ross2011-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | EA cdata demuxer: support 6 channel filesPeter Ross2011-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | EA cdata demuxer: set codec->sample_fmtPeter Ross2011-04-24
| | | | | | | | | | | | This is required by has_codec_parameters in libavformat/utils.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Handle unicode file names on windowsKirill Gavrilov2011-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | All file names should be in UTF-8 within libavformat. This is handled by mapping the open() function to an internal one in os_support.h for windows. fopen() could be overridden in the same way, but if that would be used from ffmpeg.c, it would add a dependency on an ff prefixed internal lavf function. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: Rename the open/close functions to alloc/freeMartin Storsjö2011-04-24
| | | | | | | | | | | | | | This avoids clashes if we internally want to override the global open function. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Fix mov debug (u)int64_t format strings.Alex Converse2011-04-22
| |
| * applehttp: Handle AES-128 encrypted streamsMartin Storsjö2011-04-23
| | | | | | | | | | | | | | | | | | | | This should hopefully fix roundup issue 2586. This commit only implements it in the demuxer, not in the protocol handler. If desired, some of the code could be refactored to be shared by both implementations. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Add a protocol handler for AES CBC decryption with PKCS7 paddingMartin Storsjö2011-04-23
| | | | | | | | | | | | | | | | | | | | | | | | This can later be extended to support other AES bit sizes, encryption, other crypto algorithms, reading the key from a URL, etc. In order to use it, the key and initialization vector has to be passed via AVOptions. Since such options can't be passed to protocols from the command line, the protocol is currently only for libavformat internal use. Signed-off-by: Martin Storsjö <martin@martin.st>
* | 10l: Add misssing CR/LF.Carl Eugen Hoyos2011-04-23
| |
* | Support channel layout when demuxing aif files.Carl Eugen Hoyos2011-04-23
| |
* | Support channel layout when demuxing caf files.Carl Eugen Hoyos2011-04-23
| |
* | Extend unknown CAF chunk warning message: Print size.Carl Eugen Hoyos2011-04-23
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Use av_log_ask_for_sample() to request samples from users. Make av_log_ask_for_sample() accept a variable number of arguments. vqavideo: We no longer need to ask for version 1 samples. aacdec: indentation cosmetics Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use av_log_ask_for_sample() to request samples from users.Diego Biurrun2011-04-22
| |
* | Support Canopus SD50 with fourcc "CDV5".Carl Eugen Hoyos2011-04-22
| | | | | | | | Fixes ticket #93.
* | matroskaenc: replace AVERROR_NOTSUPP with AVERROR(EINVAL)Stefano Sabatini2011-04-22
| | | | | | | | | | | | | | | | AVERROR_NOTSUPP has been dropped with the major bump. Since the signalled error denotes a configuration problem, AVERROR(EINVAL) looks an adequate replacement. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition. Introduce slice threads flag. FATE: allow forcing thread-type when doing threaded fate runs. Use av_log_ask_for_sample() where appropriate. error: sort, pack, and align error code and string definitions The stabilization period after version bumps should be one month, not one week. applehttp: Expose the stream bitrate via metadata doc: Add some initial docs on the applehttp demuxer Provide a fallback version of the libm function trunc libavdevice: Define _XOPEN_SOURCE for usleep lavc: provide deprecated avcodec_thread_init until next major version lavc: provide the opt.h header until the next bump error: change AVERROR_EOF value error: remove AVERROR_NUMEXPECTED error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c Conflicts: libavcodec/h264.c libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * applehttp: Expose the stream bitrate via metadataMartin Storsjö2011-04-21
| | | | | | | | | | | | | | This helps callers to intelligently switch between bitrate variants. Signed-off-by: Martin Storsjö <martin@martin.st>
| * error: remove AVERROR_NUMEXPECTEDStefano Sabatini2011-04-21
| | | | | | | | | | | | | | | | | | | | | | AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and has a too much specific meaning, which is better explained through a log message. Thus it can be replaced by AVERROR(EINVAL). This breaks API. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | img2: return AVERROR(EINVAL) in case of invalid filename patternStefano Sabatini2011-04-21
| | | | | | | | | | | | | | | | | | | | In write_packet(), return AVERROR(EINVAL) rather than AVERROR(EIO) if the provided output filename pattern is not valid. Indeed this has to be considered a configuration error rather than an I/O error. Allow a less confusing error report. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Makefile: Include dependencies for test tools, too Remove a version check in av_log made unnecessary by the big bump. update last major version increase dates in APIchanges Reduce picture size for yadif. oggdec: use av_freep() instead of av_free() avio: Fix sanity checks in ffurl_read* libavformat: Free AVFormatContext->streams libavformat: Make protocols pass URLContext as log context where available asf: remove commented out code in asf_read_seek not pulled: libpostproc: Remove crufty code disabled by the big bump. Reflect 0.7_beta1 release in the Changelog not pulled: sws: remove disabled cruft. lavu: remove disabled ff_random_get_seed cruft. lavu: remove disabled sha1 cruft. Conflicts: Changelog libavutil/sha1.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: use av_freep() instead of av_free()Michael Niedermayer2011-04-20
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avio: Fix sanity checks in ffurl_read*Martin Storsjö2011-04-20
| | | | | | | | | | | | | | This fixes e.g. reading data over HTTP, where the underlying socket is set to read/write. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * libavformat: Free AVFormatContext->streamsMartin Storsjö2011-04-20
| | | | | | | | | | | | | | | | After switching this from a statically allocated array to a dynamically allocated one in the major bump, this needs explicit freeing. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Make protocols pass URLContext as log context where availableMartin Storsjö2011-04-20
| | | | | | | | | | | | | | Since the libavformat major bump, URLContext contains an AVClass, making it a usable log context. Signed-off-by: Martin Storsjö <martin@martin.st>
| * asf: remove commented out code in asf_read_seekVladimir Pantelic2011-04-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | avio: fix AVIO_FLAG_READ/WRITE test in ffurl_*.Nicolas George2011-04-20
| | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
* | 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>
| * prefer avio_check() over url_exist()Stefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with url_exist() is that it tries to open a resource in RDONLY mode. If the file is a FIFO and there is already a reading client, the open() call will hang. By using avio_check() with access mode of 0, the second reading process will check if the file exists without attempting to open it, thus avoiding the lock. Fix issue #1663. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * 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.
| * lavf: remove misc disabled cruft.Anton Khirnov2011-04-19
| |
| * lavf: remove FF_API_INDEX_BUILT cruftAnton Khirnov2011-04-19
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 18:08:31 +0000