aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat/flvdec: Show unknown tags at debug levelMichael Niedermayer2015-06-051-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: Add TYPE_ONCAPTIONINFOMichael Niedermayer2015-06-051-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: increase buffer size for parsing metadata string keyMichael Niedermayer2015-06-051-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskaenc: Write Block Keyframe correctlyVignesh Venkatasubramanian2015-06-051-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per matroska Block Structure [1], for keyframes 0th bit of the flag should not be set (unlike SimpleBlocks). For Blocks, keyframes is inferred by the absence of ReferenceBlock element (as done by matroskadec). This CL writes the flag correctly and inserts the ReferenceBlock element for non-keyframes. The timestamp inserted is that of the immediately preceding frame (which is true for VP8 and VP9 - the only 2 codecs using the matroska block element as of now). It also considers all non-video frames (audio, subtitles, metadata) to be keyframes. [1] http://www.matroska.org/technical/specs/index.html#block_structure Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/riffenc: Set correct block align for mp2.Juanjo2015-06-041-1/+1
| | | | | | | | | | | | Rounding by Michael. Fixes ticket #4565.
* | Revert "avformat/rtpenc: check av_packet_get_side_data() return, fix null ↵Michael Niedermayer2015-06-031-4/+0
| | | | | | | | | | | | | | | | | | ptr dereference" This was simply wrong Found-by: Martin Storsjö This reverts commit 5d8e4f6da03c0342157e6ac7fab1a8ac3a87a8b0.
* | avformat/mov: Retry same packet on IO failure to avoid loosing a packetMichael Niedermayer2015-06-031-2/+13
| | | | | | | | | | | | Based on patch by: Zhang Rui <bbcallen@gmail.com> Reviewed-by: Zhang Rui <bbcallen@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: Accept MXF D-10 with 49.999840 Mbit/secMichael Niedermayer2015-06-031-3/+4
| | | | | | | | | | | | | | This is the maximum rate possible based on the frame size limit of MXF D-10 Previous version reviewed by tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/sbgdec: Check alloc_array_elem() return valueMichael Niedermayer2015-06-021-0/+2
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: return error instead of segfaulting if there are no streamsMichael Niedermayer2015-06-021-0/+4
| | | | | | | | | | | | Fixes segfault from ticket 4350 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Fix potential signed overflowsMichael Niedermayer2015-06-011-2/+2
| | | | | | | | | | | | Fixes CID1302838 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: Correct klv_fill_keyMichael Niedermayer2015-06-011-1/+1
| | | | | | | | | | | | | | See SMPTE 377-1-2009 6.3.3 KLV Fill Items Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'Michael Niedermayer2015-06-012-7/+11
|\| | | | | | | | | | | | | * commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505': rtmpdh: Use GMP functions directly, instead of nettle wrappers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Use GMP functions directly, instead of nettle wrappersMartin Storsjö2015-06-012-7/+11
| | | | | | | | | | | | | | | | | | mpz_import and mpz_export were added in GMP 4.1, in 2002. This simplifies the DH code by clarifying that it only uses pure bignum functions, no other parts of nettle/hogweed. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'Michael Niedermayer2015-06-011-5/+5
|\| | | | | | | | | | | | | * commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214': rtmpdh: Fix the indentation in a struct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Fix the indentation in a structMartin Storsjö2015-06-011-5/+5
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/utils: Simplify get_std_framerate() checkMichael Niedermayer2015-06-011-1/+1
| | | | | | | | | | | | This also avoids using a floating point operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d'Michael Niedermayer2015-06-011-41/+75
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c720657c23afd798ae0db7c7362eb859a89ab3d': mov: always check avio_read return value Conflicts: libavformat/mov.c See: b71528d8967c1e10f499432fe26ff4713d1fd3b6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: always check avio_read return valueAndreas Cadhalpun2015-05-311-22/+101
| | | | | | | | | | | | | | | | | | | | | | If avio_read fails, the buffer can contain uninitialized data. This fixes 'Conditional jump or move depends on uninitialised value(s)' valgrind warnings, and addresses a few memleaks. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f'Michael Niedermayer2015-06-012-0/+15
|\| | | | | | | | | | | | | * commit 'bff0349d9da527084e1433167466d8afc9e25c7f': avio: Add avio_read wrapper to simplify error checking Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Add avio_read wrapper to simplify error checkingVittorio Giovara2015-05-312-0/+15
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: reject zero bytes_per_frame with non-zero samples_per_frameAndreas Cadhalpun2015-05-311-0/+7
| | | | | | | | | | | | | | In this case the mov demuxer can return a large number of empty packets. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: abort on EOF in ff_mov_read_chanAndreas Cadhalpun2015-05-311-0/+5
| | | | | | | | | | | | | | Otherwise the loop can take a lot of time if num_descr is very large. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'Michael Niedermayer2015-06-011-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c': mov: Correctly allocate ctts_data Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Correctly allocate ctts_dataLuca Barbato2015-05-311-1/+1
| | | | | | | | | | | | It can be reallocated. CC: libav-stable@libav.org
| * mov: Fix two memleaksAndreas Cadhalpun2015-05-311-1/+4
| | | | | | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
| * network: prevent SIGPIPE on OSXwm42015-05-311-0/+4
| | | | | | | | | | | | | | | | OSX does not know MSG_NOSIGNAL. BSD (which OSX is based on) has got the socket option SO_NOSIGPIPE (even if modern BSDs also support MSG_NOSIGNAL). Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/libquvi: fix error handlingGilles Chanteperdrix2015-05-311-17/+29
| | | | | | | | | | | | avoid calling cleanup functions on uninitialized variables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | network: prevent SIGPIPE on OSXwm42015-05-301-0/+4
| | | | | | | | | | | | | | OSX does not know MSG_NOSIGNAL, and provides its own non-standard mechanism instead. I guess Apple hates standards. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Add loction/xyz support to allow copying data between mov filesMichael Niedermayer2015-05-301-0/+1
| | | | | | | | | | | | Fixes Ticket4337 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Also export loci altitudeMichael Niedermayer2015-05-301-2/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Append place name instead of overwriting for lociMichael Niedermayer2015-05-301-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/tls_securetransport: add missing copyright noticeRodger Combs2015-05-301-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/h264dec: Add ff_tlog() with trace information about h264 probingMichael Niedermayer2015-05-301-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodesMichael Niedermayer2015-05-301-2/+4
| | | | | | | | | | | | Fies Ticket4325 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'Michael Niedermayer2015-05-301-7/+9
|\| | | | | | | | | | | | | * commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6': rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Generate the whole private exponent using av_get_random_seed() with ↵Martin Storsjö2015-05-291-7/+9
| | | | | | | | | | | | | | | | | | nettle/gmp Don't use a PRNG for generating it; that defies the intended use within the cryptograhic handshake. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/tls: Support Secure TransportRodger Combs2015-05-296-4/+401
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix DTS calculation for samples with negative stts durationAndreas Cadhalpun2015-05-291-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A negative sample duration is invalid according to the spec, but there are samples that use it for the DTS calculation, e.g.: http://files.1f0.de/samples/mp4-negative-stts-problem.mp4 These currently get out of A/V sync. Also change the logging type to AV_LOG_WARNING, because decoding the sample can continue. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/movenc: Check that track_width_1616 fits within the available 32bit ↵Michael Niedermayer2015-05-291-1/+3
| | | | | | | | | | | | before storing it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: avoid floats in width/height/aspect ratio computationsMichael Niedermayer2015-05-291-4/+6
| | | | | | | | | | | | This avoids the possibility for rounding/precision differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/concatdec: Enable auto_convert by defaultMichael Niedermayer2015-05-291-1/+1
| | | | | | | | | | | | | | | | Users have no means to find out from a failure how to make it work or is it preferred to check and print a warning for h264 concat without auto_convert ? Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Avoid float usage in yuv_to_rgba()Michael Niedermayer2015-05-291-3/+3
| | | | | | | | | | | | This avoids the possibility for rounding/precision differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'Michael Niedermayer2015-05-291-4/+4
|\| | | | | | | | | | | | | * commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1': rtmpdh: Create sufficiently long private keys for gcrypt/nettle Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Create sufficiently long private keys for gcrypt/nettleMartin Storsjö2015-05-291-4/+4
| | | | | | | | | | | | | | There was a misunderstanding betewen bits and bytes for the parameter value for generating random big numbers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'Michael Niedermayer2015-05-291-5/+0
|\| | | | | | | | | | | | | * commit '8016a1bd3b60e917e1b12748dd80c06c3462c286': rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_keyMartin Storsjö2015-05-291-5/+0
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'Michael Niedermayer2015-05-292-0/+143
|\| | | | | | | | | | | | | * commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53': rtmpdh: Add fate test for the DH handshake routine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Add fate test for the DH handshake routineMartin Storsjö2015-05-292-0/+143
| | | | | | | | | | | | | | This helps if these functions need to be implemented using another crypto API. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'Michael Niedermayer2015-05-293-5/+8
|\| | | | | | | | | | | | | * commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4': rtmpdh: Pass the actual buffer size of the output secret key Merged-by: Michael Niedermayer <michaelni@gmx.at>