summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12Michael Niedermayer2015-06-161-1/+1
| | | | | | | | 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-161-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-13/+13
|\ | | | | | | | | | | | | | | | | | | * commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07': nut: Drop doxygen markers Conflicts: libavformat/nut.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Drop doxygen markersLuca Barbato2015-06-151-12/+12
| |
* | Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'Michael Niedermayer2015-06-151-0/+1
|\ \ | |/ | | | | | | | | | | * commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0': riff: Add MNM4 FourCC as mpeg4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add MNM4 FourCC as mpeg4Vittorio Giovara2015-06-151-0/+1
| |
| * tls_gnutls: fix hang on disconnectionwm42015-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | 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-131-0/+2
| |
* | Remove a few occurences of "long long" from the libraries.Carl Eugen Hoyos2015-06-132-2/+2
| |
* | Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'Michael Niedermayer2015-06-122-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-122-2/+3
| |
* | Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'Michael Niedermayer2015-06-121-1/+2
|\ \ | |/ | | | | | | | | | | * 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-121-1/+2
| | | | | | | | Reported-By: infer
| * movenc: fixes a questionable valgrind uninitialized value warningJanne Grunau2015-06-101-1/+1
| | | | | | | | | | | | | | 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-121-0/+14
| | | | | | | | | | | | | | Fixes Ticket2345 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: verify seekhead IDswm42015-06-121-0/+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-121-0/+8
| | | | | | | | | | 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-112-1/+8
| | | | | | | | | | | | This allows us to adjust it internally. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aiffdec: avoid double and ldexp()Michael Niedermayer2015-06-111-4/+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-111-1/+1
| | | | | | | | | | | | 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-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Do not ignore registration descriptors when probing is enabledMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | | | | | | 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-101-1/+3
| | | | | | | | | | | | | | | | | | 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-101-2/+3
| | | | | | | | | | | | | | 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-091-1/+1
| | | | | | | | | | | | | | | | 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>
* | avformat/oggenc: Fix return code in case of flushingMichael Niedermayer2015-06-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'Michael Niedermayer2015-06-091-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b': mkv: Correctly report the latest packet had been flushed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Correctly report the latest packet had been flushedLuca Barbato2015-06-091-1/+1
| | | | | | | | | | Bug-Id: 865 CC: libav-stable@libav.org
| * mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to failJames Almer2015-06-091-4/+4
| | | | | | | | | | | | | | The first check is done without the AVIOContext, so alloc it only if said check succeeds Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | lavf/segment: add an option to allow breaking on non-keyframesRodger Combs2015-06-091-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/tls_securetransport: fix SNI support when not verifyingRodger Combs2015-06-091-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to failJames Almer2015-06-081-4/+3
| | | | | | | | | | | | | | The first check is done without the AVIOContext, so alloc it only if said check succeeds Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'Michael Niedermayer2015-06-081-2/+11
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef': rtpdec_asf: Check memory allocation and free memory on error Conflicts: libavformat/rtpdec_asf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_asf: Check memory allocation and free memory on errorVittorio Giovara2015-06-081-2/+10
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1257774
* | Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'Michael Niedermayer2015-06-081-1/+5
|\ \ | |/ | | | | | | | | | | * commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5': mov: Check memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Check memory allocationVittorio Giovara2015-06-081-1/+5
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1292518
* | Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'Michael Niedermayer2015-06-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f7e932473314e6ca4c851d49cbde8570b6e66383': audiointerleave: Always initialize new_pkt Conflicts: libavformat/audiointerleave.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audiointerleave: Always initialize new_pktVittorio Giovara2015-06-081-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 609333
* | Merge commit '8ef98855d25e457094468e2e1a79d9b10d6445b2'Michael Niedermayer2015-06-081-1/+1
|\ \ | |/ | | | | | | | | | | * commit '8ef98855d25e457094468e2e1a79d9b10d6445b2': sctp: Always initialize outmsg struct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sctp: Always initialize outmsg structVittorio Giovara2015-06-081-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1302711
* | Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'Michael Niedermayer2015-06-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'caf7be30b11288c498fae67be4741bfbf083d977': mpjpgdec: free AVIOContext leak on early probe fail Conflicts: libavformat/mpjpegdec.c See: 34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49, this was mistakenly reimplemented, also see ffmpeg IRC log of today Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpjpgdec: free AVIOContext leak on early probe failJanne Grunau2015-06-081-2/+2
| |
* | mpjpegdec: fix memory leak in probe functionJames Almer2015-06-081-1/+2
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/tls: let the user specify what name to verify againstRodger Combs2015-06-082-7/+13
| | | | | | | | | | | | | | This can be useful for debugging, or in scenarios where the user doesn't want to use the system's DNS settings for whatever reason. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: Allow overriding /manual setting of the signal standardMichael Niedermayer2015-06-081-0/+26
| | | | | | | | | | previous patch reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/version: Bump version for single jpeg muxerMichael Niedermayer2015-06-081-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Add single jpeg muxerCaligula useraccount2015-06-083-0/+13
| | | | | | | | | | | | | | Needed to fix Ticket4218 Based on patch by: Otávio Ribeiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'Michael Niedermayer2015-06-082-1/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '252d6200c36e7eaa79f8d5205b7d731179e94897': avio: Add avio_put_str16be Conflicts: doc/APIchanges libavformat/avio.h libavformat/aviobuf.c libavformat/version.h The FFmpeg implementation is kept as requested by ubitux Doxy improvements merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status