summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* matroskadec: check audio sample rateAndreas Cadhalpun2015-06-161-0/+8
| | | | | | | | | And default to 8000 if it is invalid. An invalid sample rate can trigger av_assert2 in av_rescale_rnd. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]>
* avcodec/codec_desc: rename smv video codec name to smvjpeg to match decoder namePaul B Mahol2015-06-161-1/+1
| | | | | | Also fixes clash with smv audio codec. Signed-off-by: Paul B Mahol <[email protected]>
* avcodec/jpeg2000dwt: Fix 9/7 IDWT for small sizesMichael Niedermayer2015-06-161-2/+8
| | | | | | Fixes Ticket4631 Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/jpeg2000dwt: add special cases for handling length 1 in 5/3 decodeMichael Niedermayer2015-06-161-1/+4
| | | | | | Fixes Ticket4630 Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/jpeg2000dec: Improve end checkMichael Niedermayer2015-06-161-2/+3
| | | | | | Fixes spurious end mismatch warnings Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/jpeg2000dec: Fix term_cnt checkMichael Niedermayer2015-06-161-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* MAINTAINERS: add myself as hls encryption maintainerChristian Suloway2015-06-161-0/+1
| | | | | Signed-off-by: Christian Suloway <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/hlsenc: removed empty/unused print_encryption_tag functionChristian Suloway2015-06-161-4/+0
| | | | | Signed-off-by: Christian Suloway <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* 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 <[email protected]> Reviewed-by: tim nicholson <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/flacenc: Fix Invalid Rice orderGeorge Boyle2015-06-161-1/+1
| | | | | | | | | | | | | Fixes ticket #4628. The problem arose, in the sample file at least, in the last block where the minimum and maximum Rice partition orders were both 0. In that case, and any other where pmax == pmin, the original UINT32_MAX placeholder value for bits[opt_porder] was getting overwritten before the comparison to check if the current partition order is a new optimal, so the correct partition order and RiceContext params were not being set. Signed-off-by: Michael Niedermayer <[email protected]>
* doc/muxers.texi: properly insert {}s in exampleJames Zern2015-06-161-1/+1
| | | | | | | | | | | | use '@{' / '@}', fixes compile errors: *** '{' without macro. Before: 1:-'.'} *** '}' without opening '{' before: since: 907ac20 avformat/hlsenc: added HLS encryption Signed-off-by: James Zern <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/hlsenc: added HLS encryptionChristian Suloway2015-06-162-2/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Dan Dennedy <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/jpeg2000dec: increase tile part limit to 32Michael Niedermayer2015-06-151-1/+1
| | | | | | Fixes Ticket4629 Signed-off-by: Michael Niedermayer <[email protected]>
* avfilter/af_afade: add couple of more curvesPaul B Mahol2015-06-152-6/+42
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'Michael Niedermayer2015-06-150-0/+0
|\ | | | | | | | | | | | | | | * commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066': h264: er: Copy from the previous reference only if compatible See: fdc64a104410f5fcc7f35b62287b0ae502b7061a Merged-by: Michael Niedermayer <[email protected]>
| * h264: er: Copy from the previous reference only if compatibleAndreas Cadhalpun2015-06-151-2/+5
| | | | | | | | | | | | | | | | Also use the frame pixel format instead of the one from the codec context, which is more robust. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'Michael Niedermayer2015-06-151-3/+19
|\| | | | | | | | | | | | | | | | | | | * commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26': lavc: Clarify the behaviour of dimension and format context fields Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <[email protected]>
| * lavc: Clarify the behaviour of dimension and format context fieldsLuca Barbato2015-06-151-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | The AVCodecContext width, height, coded_width, coded_height and format are used mainly as decoding hints and they get internally overwritten during the data parsing stage. Do not assume they match the last AVFrame provided by avcodec_decode_video2 and assimilated functions since multi-threading and other frame reordering might make those values to refer to frames that will be outputted in the future. CC: [email protected]
* | Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'Michael Niedermayer2015-06-151-81/+90
|\| | | | | | | | | | | | | | | | | | | * commit '03ca6d70df192125a772dadd01acfe3905aa653f': x264: Factor out the reconfiguration code Conflicts: libavcodec/libx264.c Merged-by: Michael Niedermayer <[email protected]>
| * x264: Factor out the reconfiguration codeLuca Barbato2015-06-151-78/+86
| |
* | Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07'Michael Niedermayer2015-06-151-13/+13
|\| | | | | | | | | | | | | | | | | | | * commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07': nut: Drop doxygen markers Conflicts: libavformat/nut.h Merged-by: Michael Niedermayer <[email protected]>
| * nut: Drop doxygen markersLuca Barbato2015-06-151-12/+12
| |
* | libvpxenc: remove stray '\'sJames Zern2015-06-151-4/+4
| | | | | | | | Signed-off-by: James Zern <[email protected]>
* | libvpxenc: cosmetics: reindent after 2c70436James Zern2015-06-151-1/+1
| | | | | | | | Signed-off-by: James Zern <[email protected]>
* | Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'Michael Niedermayer2015-06-151-0/+1
|\| | | | | | | | | | | | | * commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0': riff: Add MNM4 FourCC as mpeg4 Merged-by: Michael Niedermayer <[email protected]>
| * riff: Add MNM4 FourCC as mpeg4Vittorio Giovara2015-06-151-0/+1
| |
* | encoders.texi: update libvpx documentationJames Zern2015-06-151-75/+103
| | | | | | | | | | | | | | | | modeled after the libx264 section. Reviewed-by: Lou Logan <[email protected]> Reviewed-by: Stefano Sabatini <[email protected]> Signed-off-by: James Zern <[email protected]>
* | avcodec/jpeg2000dec: Omit mqc reinit after the last passMichael Niedermayer2015-06-151-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | doc/filters: add one more compand example found in the wildPaul B Mahol2015-06-151-0/+5
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | examples/demuxing_decoding: use properties from frame instead of video_dec_ctxAndreas Cadhalpun2015-06-151-14/+16
| | | | | | | | | | | | | | | | | | This is more robust. And only check if there is actually a frame returned. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]>
* | h264: er: Copy from the previous reference only if compatibleAndreas Cadhalpun2015-06-151-2/+5
| | | | | | | | | | | | | | | | | | Also use the frame pixel format instead of the one from the codec context, which is more robust. Signed-off-by: Luca Barbato <[email protected]> Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: Andreas Cadhalpun <[email protected]>
* | avcodec/jpeg2000dec: Fix Vertically causal context formationMichael Niedermayer2015-06-151-13/+18
| | | | | | | | | | | | Fixes Ticket4626 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mqcdec: set raw flag at the begin of ff_mqc_initdec()Michael Niedermayer2015-06-151-1/+1
| | | | | | | | | | | | This way it is available to any functions called from ff_mqc_initdec() Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Improve readability of SOP checkMichael Niedermayer2015-06-152-2/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Remove redundant checkMichael Niedermayer2015-06-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Check reslevelno in RPCLMichael Niedermayer2015-06-151-0/+3
| | | | | | | | | | | | | | Fixes out of array read Fixes Ticket4627 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Skip SOPMichael Niedermayer2015-06-151-0/+3
| | | | | | | | | | | | Fixes Ticket4625 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Use <0 instead of != 0 for error checkingMichael Niedermayer2015-06-151-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Also include remaining length in "Block length" error ↵Michael Niedermayer2015-06-151-2/+2
| | | | | | | | | | | | message Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '74ea1167d91ccb2e1f2943efa030f2c278b598be'Michael Niedermayer2015-06-150-0/+0
|\| | | | | | | | | | | | | | | * commit '74ea1167d91ccb2e1f2943efa030f2c278b598be': tls_gnutls: fix hang on disconnection See: 2222f419da99ef85d49ab04e7e15b76612f4d054 Merged-by: Michael Niedermayer <[email protected]>
| * 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ö <[email protected]>
* | avcodec/jpeg2000: Fix regression with multiple tilesMichael Niedermayer2015-06-141-6/+7
| | | | | | | | | | | | Fixes Ticket 4624 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000: Change codeblock coords to same origin as bandsMichael Niedermayer2015-06-142-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000: Change precinct coords to same origin as bandsMichael Niedermayer2015-06-141-12/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000: Fix band coordsMichael Niedermayer2015-06-141-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/jpeg2000dec: Print warning if the mqc pointer mismatches at the endMichael Niedermayer2015-06-141-0/+5
| | | | | | | | | | | | | | If this occurs on valid and correctly decoded files it should be reduced to debug level Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | avcodec/jpeg2000dec: Show the progression order at debug level for all variantsMichael Niedermayer2015-06-141-0/+2
| | | | | | | | | | | | It was previously shown just for some, this makes it consistent Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/af_afade: use av_clipd() instead of nested FFMAX & FFMINPaul B Mahol2015-06-141-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | avcodec/jpeg2000dec: Print error messages for more error conditionsMichael Niedermayer2015-06-141-7/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-14 13:23:38 +0000