summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf/file: implement move and delete callbacksMariusz Szczepańczyk2015-06-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/avio: Extend API with avio_move() and avio_delete()Mariusz Szczepańczyk2015-06-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'Michael Niedermayer2015-06-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77': mp3: enable packed main_data decoding in MP4 Conflicts: libavcodec/mpegaudiodec_template.c Only the parts needed to support the available sample are merged the remaining error checks are left in place Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3: enable packed main_data decoding in MP4nu7742015-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14496-3 suggests packing main_data of MP3 that is usually scattered into multiple frames due to bit reservoir. However, after packing main_data into a access unit, bitrate index in the MPEG audio frame header doesn't match with actual frame size. In order to accept this, this patch removes unnecessary frame size checking on mp3 decoder. Also, mov demuxer was changed to use MP3 parser only on special cases (QT MOV with specific sample description) to avoid re-packetizing. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/brstm: support little-endian s16 PCMPaul B Mahol2015-06-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/brstm: handle a BFSTM endianness oddityRodger Combs2015-06-21
| |
* | lavf/brstm: add support for seekingRodger Combs2015-06-21
| |
* | lavf/brstm: cleanup; fix short-block demuxingRodger Combs2015-06-21
| |
* | lavf/brstm: move bfstm var to a localRodger Combs2015-06-21
| |
* | avformat/rawenc: Store sample number for ADXMichael Niedermayer2015-06-21
| | | | | | | | | | | | | | Fixes Ticket4540 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support demuxing 4gv codec stored in qcp filesPaul B Mahol2015-06-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/movenc: Check return code of ff_iso8601_to_unix_time()Michael Niedermayer2015-06-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/brstm: allow larger block sizesRodger Combs2015-06-20
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/brstm: support little-endian files (BCSTM; 3DS)Rodger Combs2015-06-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: clarify what package needs to be compiled with SSL supportwm42015-06-18
| | | | | | | | | | | | Try to reduce user confusion. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2: strip trailing spaces from APIC tagwm42015-06-18
| | | | | | | | | | | | | | | | | | | | | | The APIC description must be unique, and some ID3v2 tag writers add spaces to write several APIC entries with the same description. The trailing spaces simply serve as a way to disambiguate the description. Do this so that API users do not have to special-case mp3 to fix this cosmetic issue. Requested-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2: detect PNG by header instead of mimeMichael Niedermayer2015-06-18
| | | | | | | | | | | | | | | | the mimetype for PNG can be set to jpeg Fixes 01\ -\ Cider\ Time.mp3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/brstm: add support for BFSTM filesRodger Combs2015-06-17
| | | | | | | | | | Previous version reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avio: fix potential crashes when combining ffio_ensure_seekback + crcwm42015-06-17
| | | | | | | | | | | | | | | | | | | | | | | | Calling ffio_ensure_seekback() if ffio_init_checksum() has been called on the same context can lead to out of bounds memory accesses and crashes. The reason is that ffio_ensure_seekback() does not update checksum_ptr after reallocating the buffer, resulting in a dangling pointer. This effectively fixes potential crashes when opening mp3 files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: avoid incorrect phrase 'allows to'Andreas Cadhalpun2015-06-16
| | | | | | | | | | | | | | | | Also fix typo found by Lou Logan: Sacrifying -> Sacrificing Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | matroskadec: validate audio channels and bitdepthAndreas Cadhalpun2015-06-16
| | | | | | | | | | | | | | | | | | In the TTA extradata re-construction the values are written with avio_wl16 and if they don't fit into uint16_t, this triggers an av_assert2 in avio_w8. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | matroskadec: check audio sample rateAndreas Cadhalpun2015-06-16
| | | | | | | | | | | | | | | | | | And default to 8000 if it is invalid. An invalid sample rate can trigger av_assert2 in av_rescale_rnd. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/hlsenc: removed empty/unused print_encryption_tag functionChristian Suloway2015-06-16
| | | | | | | | | | Signed-off-by: Christian Suloway <csuloway@globaleagleent.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12Michael Niedermayer2015-06-16
| | | | | | | | | | | | | | | | This should make no difference as the byte is ignored Found-by: tim nicholson <nichot20@yahoo.com> Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hlsenc: added HLS encryptionChristian Suloway2015-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added HLS encryption with -hls_key_info_file <key_info_file> option. The first line of key_info_file specifies the key URI written to the playlist. The key URL is used to access the encryption key during playback. The second line specifies the path to the key file used to obtain the key during the encryption process. The key file is read as a single packed array of 16 octets in binary format. The optional third line specifies the initialization vector (IV) as a hexadecimal string to be used instead of the segment sequence number (default) for encryption. Changes to key_info_file will result in segment encryption with the new key/IV and an entry in the playlist for the new key URI/IV. Key info file format: <key URI> <key file path> <IV> (optional) Example key URIs: http://server/file.key /path/to/file.key file.key Example key file paths: file.key /path/to/file.key Example IV: 0123456789ABCDEF0123456789ABCDEF Example: ffmpeg -f lavfi -i testsrc -c:v h264 -hls_key_info_file file.keyinfo foo.m3u8 file.keyinfo: http://server/file.key /path/to/file.key 0123456789ABCDEF0123456789ABCDEF Example shell script: BASE_URL=${1:-'.'} openssl rand 16 > file.key echo $BASE_URL/file.key > file.keyinfo echo file.key >> file.keyinfo echo $(openssl rand -hex 16) >> file.keyinfo ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \ -hls_key_info_file file.keyinfo out.m3u8 -- Signed-off-by: Christian Suloway <csuloway@globaleagleent.com> Signed-off-by: Dan Dennedy <dan@dennedy.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'Michael Niedermayer2015-06-15
|\| | | | | | | | | | | | | | | | | | | * commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07': nut: Drop doxygen markers Conflicts: libavformat/nut.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Drop doxygen markersLuca Barbato2015-06-15
| |
* | Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'Michael Niedermayer2015-06-15
|\| | | | | | | | | | | | | * commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0': riff: Add MNM4 FourCC as mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add MNM4 FourCC as mpeg4Vittorio Giovara2015-06-15
| |
| * tls_gnutls: fix hang on disconnectionwm42015-06-14
| | | | | | | | | | | | | | | | | | | | | | GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's termination reply. But since we don't shutdown the TCP connection at this point yet, GnuTLS will just keep skipping actual data from the server, which basically is perceived as hang. Use GNUTLS_SHUT_WR instead, which doesn't have this problem. Signed-off-by: Martin Storsjö <martin@martin.st>
* | tls_gnutls: fix hang on disconnectionwm42015-06-14
| | | | | | | | | | | | | | | | | | | | | | GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's termination reply. But since we don't shutdown the TCP connection at this point yet, GnuTLS will just keep skipping actual data from the server, which basically is perceived as hang. Use GNUTLS_SHUT_WR instead, which doesn't have this problem. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: fix spelling errorsAndreas Cadhalpun2015-06-14
| | | | | | | | | | | | | | | | | | | | | | Neccessary -> Necessary formated -> formatted thee -> the eventhough -> even though seperately -> separately Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/singlejpeg: fix standalone compilationJames Almer2015-06-13
| |
* | Remove a few occurences of "long long" from the libraries.Carl Eugen Hoyos2015-06-13
| |
* | Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'Michael Niedermayer2015-06-12
|\| | | | | | | | | | | | | | | | | | | * commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91': flv: Name an enum and use its type Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Name an enum and use its typeVittorio Giovara2015-06-12
| |
* | Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'Michael Niedermayer2015-06-12
|\| | | | | | | | | | | | | * commit '8a78ae2d2101622fd244b99178d8bc61175c878e': segment: Check open_null_ctx() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Check open_null_ctx() return valueVittorio Giovara2015-06-12
| | | | | | | | Reported-By: infer
| * movenc: fixes a questionable valgrind uninitialized value warningJanne Grunau2015-06-10
| | | | | | | | | | | | | | display_matrix_size is only initialized when av_stream_get_side_data() returns a side data pointer. The code is safe since the only effect this has is setting the display_matrix pointer to NULL which it was already anyway.
* | avformat/mxfdec: Detect jpeg2000 through codec_ul tooMichael Niedermayer2015-06-12
| | | | | | | | | | | | | | Fixes Ticket2345 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: verify seekhead IDswm42015-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some files have SeekHead elements with broken IDs. They mismatch with the ID of the destination element. These files are written by "IDMmkvlib0.1" (as identified by the MuxingApp and WritingApp elements), and the SeekHead IDs are actually endian-swapped. This confuses the SeekHead logic of the demuxer. It will read some elements twice, because the SeekHead ID is used to identify and remember already read elements. With the file at hand, the stream list was duplicated by reading the Tracks element twice. Fix this by rejecting invalid EBML IDs in SeekHead entries. (This fix is relatively specific to the broken file at hand, and doesn't protect against some other cases of broken SeekHead, such as valid but mismatching target element IDs.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: recognizes and export private streamsMichael Niedermayer2015-06-12
| | | | | | | | | | Based on patch by Wolfgang Lorenz <wl-chmw@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avio: move short seek threshold to the contextMichael Niedermayer2015-06-11
| | | | | | | | | | | | This allows us to adjust it internally. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aiffdec: avoid double and ldexp()Michael Niedermayer2015-06-11
| | | | | | | | | | | | | | | | There is no support for non integer sample rates, using doubles/floats currently could only lead to rounding differences between platforms Previous version Reviewed-by: Mark Harris <mark.hsj@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix bug in parse_rps for HEVC.Deliang Fu2015-06-11
| | | | | | | | | | | | Make the logic in libavformat/hevc.c parse_rps align with libavcodec/hevc_ps.c ff_hevc_decode_short_term_rps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Make static packed_size, const staticMichael Niedermayer2015-06-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Do not ignore registration descriptors when probing is enabledMichael Niedermayer2015-06-10
| | | | | | | | | | | | | | This is required for the (not yet in git) private stream detection/export, no other testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/http: Correctly terminate session with HTTP POST client.Stephan Holljes2015-06-10
| | | | | | | | | | | | | | | | | | Send a footer to correctly close client sockets. This fixes network errors in client applications. Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/flvdec.c: don't build index_entries for input stream if ↵Igor Derzhavin2015-06-10
| | | | | | | | | | | | | | AVIOContext is not seekable Signed-off-by: Igor Derzhavin <igor.derzhavin@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/webm_chunk: Remove AVFMT_ALLOW_FLUSHVignesh Venkatasubramanian2015-06-09
| | | | | | | | | | | | | | | | The flag was set unintentionally and the code will break if a NULL packet is passed in. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 20:01:19 +0000