aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* avformat/swfdec: Do not error out on pixel format changesMichael Niedermayer2015-07-081-4/+2
| | | | | | | | | Instead print an error and continue Fixes Ticket4702 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69)
* doc: avoid incorrect phrase 'allows to'n2.7.1Andreas Cadhalpun2015-06-191-3/+3
| | | | | | | | | | 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> (cherry picked from commit 28efeb6502df37c99ccf18575d2552381d83a877) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* matroskadec: validate audio channels and bitdepthAndreas Cadhalpun2015-06-191-0/+12
| | | | | | | | | | | 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> (cherry picked from commit 92e79a2f7bf2f8bb0cb2d1a3e4d76737557071c4) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* matroskadec: check audio sample rateAndreas Cadhalpun2015-06-191-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 <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 5b76c82fd7a5f4f36bb901b8c43d7f7319599599) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avformat: clarify what package needs to be compiled with SSL supportwm42015-06-191-1/+1
| | | | | | | | | Try to reduce user confusion. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f6c3f1ed6048ebc55f652ed59f7af9acebbf57e5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tls_gnutls: fix hang on disconnectionwm42015-06-181-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> (cherry picked from commit 2222f419da99ef85d49ab04e7e15b76612f4d054) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avio: fix potential crashes when combining ffio_ensure_seekback + crcwm42015-06-181-0/+3
| | | | | | | | | | | | | | | 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> (cherry picked from commit dc87758775e2ce8be84e4fe598e12416e83d2845) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc: fix spelling errorsAndreas Cadhalpun2015-06-182-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> (cherry picked from commit ed0b1db640110cccdbf0db1d882fb952cf3a130d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/singlejpeg: fix standalone compilationJames Almer2015-06-181-0/+2
| | | | (cherry picked from commit 4aebaed0e17b396bd9d18acb8e58a4700c7559df)
* 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> (cherry picked from commit 6e1f8780c833ef55815111d4771b95ff78567cdb) 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>
| * avio: Add avio_put_str16beLuca Barbato2015-06-073-15/+33
| |
* | Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'Michael Niedermayer2015-06-084-2/+226
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9b56ac74b170d12027fbc81f581a451a709f1105': mpjpeg: Initial implementation Conflicts: Changelog libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpjpeg: Initial implementationLuca Barbato2015-06-074-2/+226
| | | | | | | | | | | | Support only streams with Content-Length. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/hdsenc: Change duration from single to to double precisionMichael Niedermayer2015-06-081-1/+1
| | | | | | | | | | | | This slightly improves precision Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmenc: Remove float usageMichael Niedermayer2015-06-071-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: Check for ffio_set_buf_size() failureMichael Niedermayer2015-06-071-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ffmdec: Check ffio_set_buf_size() return valueMichael Niedermayer2015-06-071-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/http: Add simple autodetection for client HTTP method, based on ↵Stephan Holljes2015-06-061-0/+9
| | | | | | | | | | | | AVIO_FLAG_READ. Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | lavf/http: Indent else-clause.Stephan Holljes2015-06-061-9/+8
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | lavf/http: Properly process HTTP header on listen.Stephan Holljes2015-06-061-1/+40
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | lavf/http: Rudimentary error handling for HTTP requests received from clients.Stephan Holljes2015-06-061-0/+18
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | lavf/http: Process HTTP header before sending response.Stephan Holljes2015-06-061-2/+2
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | lavf/http: Document method option.Stephan Holljes2015-06-061-1/+1
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | avformat/mxfenc: Add mxf muxer avclassMichael Niedermayer2015-06-061-0/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Do not select audio streams with unknown sample rate in ↵Michael Niedermayer2015-06-061-1/+1
| | | | | | | | | | | | | | | | | | av_find_best_stream() Together with the next commit this prevents non-PCM S302M from being selected unless either it can be decoded or the user selects passthrough/copy Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: fix lack of duration for some filesGanesh Ajjanagadde2015-06-051-1/+1
| | | | | | | | | | | | | | Fixes #4579 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>