summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/img2dec: Fail probing when no data is yet available and the ↵Michael Niedermayer2014-09-12
| | | | | | | | | | | filename contains no number/glob patterns either. Fixes Ticket3901 the seek test error codes change due to a change in the failure path, this could be avoided by changing the respective error codes to EINVAL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/format: Run image2 probe again when file content data is availableMichael Niedermayer2014-09-12
| | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2dec: reduce bmppipe probe scoreMichael Niedermayer2014-09-12
| | | | | | | | | bmp pipe needs the bmp parser which is not bug free and should thus not be favored over the bmp image2 demuxer that also means this change could be reverted in case bmp pipe is improved so it handles all single bmp images correctly Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2_alias_pix: Add AVClass and image2 AVOptionsMichael Niedermayer2014-09-11
| | | | | | This fixes the default timebase and allows overriding the framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2_alias & brender_pix: fix function namesMichael Niedermayer2014-09-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2_brender_pix: Add AVClass and image2 AVOptionsMichael Niedermayer2014-09-11
| | | | | | This fixes the default timebase and allows overriding the framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2: Make AVOptions available to img* demuxers defined in other filesMichael Niedermayer2014-09-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rmdec: very basic MLTI supportMichael Niedermayer2014-09-11
| | | | | | Fixes Ticket2152 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: fix "warning: explicitly assigning a variable of type ↵Michael Niedermayer2014-09-10
| | | | | | | int to itself" Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mp3dec: Improve seeking frame sync codeMichael Niedermayer2014-09-10
| | | | | | Fixes Ticket3884 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: remove FF_API_ASS_SSA dead codeClément Bœsch2014-09-09
|
* avformat/mpeg: update comment on probe scoreMichael Niedermayer2014-09-09
| | | | | Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpeg: increase score for short mpeg-ps by 1Michael Niedermayer2014-09-09
| | | | | | Fixes Ticket 3855 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rtpdec_qt: Fix 'warning: passing argument 2 of ffio_init_context ↵Michael Niedermayer2014-09-08
| | | | | | discards const qualifier from pointer target type' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/segment: abort in case of invalid segment format optionsStefano Sabatini2014-09-08
|
* avformat/utils: Exclude the header size when computing duration from bit_rateHendrik Leppkes2014-09-08
| | | | | | | | This improves the estimate for MP3s with cover art tags. Fixes Ticket2931 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'Michael Niedermayer2014-09-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '803e82276b3716bf6012ec69e8854dae14a4fd2b': libavformat: Check mkdir return error codes Conflicts: libavformat/hdsenc.c libavformat/smoothstreamingenc.c See: c89f8f80cc83622471eaf99e451e78df68475e19 See: a3886ea3c5947ca05bfe01b053d9ce2f9725d9eb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Check mkdir return error codesMartin Storsjö2014-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the returned error codes were intentionally ignored (see fadd3a68213), to avoid aborting if the directory already existed. If the mkdir actually failed, this was caught when opening files within the directory fails anyway. By handling the error code here (but explicitly ignoring EEXIST), the error messages and return codes in these cases are more appropriate and less confusing. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/m4vdec: Check for non startcode 00 00 00 sequences in probeMichael Niedermayer2014-09-07
| | | | | | | | | | | | | | Fixes miss detection of PCM as m4v Fixes Ticket 3928 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: add segment_format_options optionStefano Sabatini2014-09-07
| |
* | avformat/swfdec: Do not change the pixel formatMichael Niedermayer2014-09-07
| | | | | | | | | | | | | | This is currently not supported Fixes part of Ticket 3539 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: fix spelling errorAndreas Cadhalpun2014-09-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/srtdec: speed up probingwm42014-09-05
| |
* | avformat/realtextdec: UTF-16 supportwm42014-09-05
| | | | | | | | Also remove ff_smil_extract_next_chunk - this was the last user of it.
* | avformat/samidec: UTF-16 supportwm42014-09-05
| | | | | | | | ff_smil_extract_next_chunk() is still used by RealText.
* | avformat/srtdec: UTF-16 supportwm42014-09-05
| |
* | avformat/assdec: UTF-16 supportwm42014-09-05
| | | | | | | | | | | | | | | | | | | | Use the UTF-16 BOM to detect UTF-16 encoding. Convert the file contents to UTF-8 on the fly using FFTextReader, which acts as converting wrapper around AVIOContext. It also can work on a static buffer, needed for format probing. The FFTextReader wrapper now also takes care of skipping the UTF-8 BOM. Fix Ticket #3496.
* | lavf/ffmdec: return proper error code in ffm2_read_header()Stefano Sabatini2014-09-05
| | | | | | | | Also log an error message in case of invalid packet size.
* | Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'Michael Niedermayer2014-09-04
|\| | | | | | | | | | | | | | | | | | | * commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2': vc1: Split bits used in libavformat into a separate header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Split bits used in libavformat into a separate headerDiego Biurrun2014-09-04
| | | | | | | | This reduces inter-library dependencies.
* | avformat/flvdec: read the correct bits into the tag typeSteven Liu2014-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the flv spec, the flvtag define the tagtype as one byte, the spec desc is: Reserved UB[2] Reserved for FMS, should be 0 Filter UB[1] Indicates if packets are filtered. 0 = No pre-processing required. 1 = Pre-processing (such as decryption) of the packet is required before it can be rendered. Shall be 0 in unencrypted files, and 1 for encrypted tags. See Annex F. FLV Encryption for the use of filters. TagType UB[5] Type of contents in this tag. The following types are defined: 8 = audio 9 = video 18 = script data Signed-off-by: Steven Liu <qi.liu@chinacache.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '95e177eeb21f3e968aa9353bc69d1946966cc835': rtpdec: HEVC/H.265 support Conflicts: Changelog libavformat/rtpdec_hevc.c libavformat/version.h See: 96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: HEVC/H.265 supportThomas Volkert2014-09-03
| | | | | | | | | | | | As specified in draft-ietf-payload-rtp-h265-06. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/mpegts: Change order of structs to match ↵Michael Niedermayer2014-09-03
| | | | | | | | | | | | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | | | | | | | * commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74': mpegts: Allow custom max resync size Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Allow custom max resync sizeLuca Barbato2014-09-03
| |
* | avformat/swfdec: Use side data to communicate w/h changes to the decoderMichael Niedermayer2014-09-02
| | | | | | | | | | | | | | | | Fixes reading from freed data Fixes part of Ticket3539 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: fix copying stream metadataMika Raento2014-09-02
| | | | | | | | | | | | To get mpegts metadata copied when segmenting. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: use mpegts_flags instead of the deprecated resend_headers optionMika Raento2014-09-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Use avformat_alloc_output_context2()Michael Niedermayer2014-09-02
| | | | | | | | | | | | | | | | This avoids having to assign oformat, allows returning the correct error code and allocates priv_data Based on patch by: Mika Raento <mika.raento@elisa.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding of ImageJ png in avi.Carl Eugen Hoyos2014-09-02
| | | | | | | | Fixes ticket #3916.
* | segment: don't access outside seg->frames arrayMika Raento2014-09-02
| | | | | | | | | | | | Fixes wrong number of segments output and undefined memory access. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: favor DESC_types over probed codecsMichael Niedermayer2014-09-01
| | | | | | | | | | | | | | Fixes Ticket3766 Fixes dvb_teletext detection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dfa: use avio_feof()Paul B Mahol2014-08-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | oggdec: fix invalid free on errorwm42014-08-30
| | | | | | | | | | | | | | The read_packet callback passes a pointer to a stack-allocated AVPacket. Attempting to free it with av_free() makes no sense. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-08-30
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: lavf/rtpdec_hevc: Fix compilation with -DDEBUG. ffmpeg: Clean up if filter initialisation failed to avoid a memleak. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/rtpdec_hevc: Fix compilation with -DDEBUG.Carl Eugen Hoyos2014-08-30
| | |
* | | avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #ifMichael Niedermayer2014-08-30
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if ↵Michael Niedermayer2014-08-30
| | | | | | | | | | | | zlib is unavailable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add missing "const" all over the place.Reimar Döffinger2014-08-29
| | | | | | | | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>