Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-19libavformat/matroskaenc.c: fix small memory leaks on errorNeil Birkbeck
Fixing small leaks that can occur when mkv_write_tracks fails in mkv_write_header (e.g., if video track has unknown codec). Also changing mkv_write_seekhead to take the MatroskaMuxContext to avoid having dangling pointers. Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-18FF_OPT_TYPE_* -> AV_OPT_TYPE_*.Ronald S. Bultje
2015-08-18Replace av_dlog with ff_dlog.Ronald S. Bultje
ff_dlog checks compilability, and is non-public. av_dlog is deprecated and no longer exists if FF_API_DLOG=0.
2015-08-18Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf'Hendrik Leppkes
* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf': asfdec: prevent the memory leak in the asf_read_metada_obj Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-18Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'Hendrik Leppkes
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33': movenc: Add a new flag for writing global sidx indexes for dash Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-16asfdec: prevent the memory leak in the asf_read_metada_objAlexandra Hájková
also do not return the error code but just break reading metadata object in the case of the aspect ratio reading failure Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-16hlsenc: Use AV_TIME_BASE units for all the computationsLuca Barbato
Do not risk mixing different timebases. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-16lavf/matroskadec: Fully parse and repack MP3 packetsRodger Combs
Fixes https://trac.ffmpeg.org/ticket/4776 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-14mxfdec: set AVFMT_SEEK_TO_PTS demuxer flagMarton Balint
Since 53f2ef2c4afb1d49a679dea9163cb0e4671f3117 seeking is done using PTS. Signed-off-by: Marton Balint <cus@passwd.hu>
2015-08-14lavf/mpegts: apply misc option description fixesStefano Sabatini
Use impersonal form, drop capitalization and ending dot.
2015-08-14avformat/rmdec: MLTI with multiple MDPR supportMichael Niedermayer
Fixes Ticket4496 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-14avformat/rmdec: Move MLTI handling out of ff_rm_read_mdpr_codecdata()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-14lavf/ftp: implement NLST methodMariusz Szczepańczyk
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-13avformat/wavdec: Detect wrongly interpreted specification about the sample ↵Michael Niedermayer
value in the fact chunk Fixes Ticket703 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-13avformat/wavdec: Do not discard sample_count due to roundingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-13avformat/tls_gnutls: correct version detection for certificate supportGanesh Ajjanagadde
Fixes Ticket3748 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-13avisynth: fix setting stream timebaseMarton Balint
Stream timebase should be set using avpriv_set_pts_info, otherwise avctx->pkt_timebase is not correct. This should fix ticket #4766. Patch is only compile tested. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-12avformat/avidec: Simplify dshow_block_align based special case detectionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-12avformat: Move MAX_PROBE_PACKETS to internal.hMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-12movenc: Add a new flag for writing global sidx indexes for dashMartin Storsjö
The double meaning of the faststart flag (moving a moov atom to the start of files, making them streamable, for non-fragmented files, vs inserting a global sidx index at the start of files for fragmented files) is confusing - see 40ed1cbf1 for explanation of its origins. Since the second meaning of the flag hasn't been part of any libav release yet, just rename it to get rid of the confusion without any extra deprecation (which wouldn't get rid of the potential confusion, of users adding -movflags faststart even for fragmented files, where it isn't needed for making them "streamable"). This gets back the old behaviour, where -movflags faststart doesn't have any effect for fragmented files. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-08-12avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flacMichael Niedermayer
The flac parser does not support it, its also not needed. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-12avformat/avidec: Add flac to the dshow_block_align exception listMichael Niedermayer
Fixes Ticket4758 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-11concatdec: fix broken file_inpoint calculationMarton Balint
Should fix ticket #4765. Signed-off-by: Marton Balint <cus@passwd.hu>
2015-08-10avformat/ftp: Use av_freep() for dir_bufferMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-10lavf/ftp: properly read an empty pathMariusz Szczepańczyk
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-10lavf/ftp: implement directory listing callbacksLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-10Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'Hendrik Leppkes
* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc': movenc: Place the sidx index after the initial moov/mdat pair Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-10Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'Hendrik Leppkes
* commit '83f254e65f938657a4dbec711e4c94252a72daf9': movenc: Rename reserved_moov_pos to reserved_header_pos Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-10Merge commit '8e34089e265a6b01e1e3301e8864439d26793753'Hendrik Leppkes
* commit '8e34089e265a6b01e1e3301e8864439d26793753': movenc: Check that frag_info entries exist in mov_write_sidx_tag Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-10movenc: Place the sidx index after the initial moov/mdat pairMartin Storsjö
For fragmented files with non-empty moov, with a fragment index (sidx), place the index after the initial moov/mdat pair. Previously, for this pathological case, the index was written at the start of the file. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-08-10movenc: Rename reserved_moov_pos to reserved_header_posMartin Storsjö
The same field is also used for writing the sidx index header, for fragmented files, when the faststart flag is used. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-08-10movenc: Check that frag_info entries exist in mov_write_sidx_tagMartin Storsjö
This fixes crashes with pathological cases when trying to write a sidx index (via the -movflags faststart option, in combination with fragmenting options), when no fragments actually have been written. (This is possible if the empty_moov flag isn't used, so that all actual packet data is written in the moov/mdat pair, and no moof/mdat pairs have been written.) In these pathological cases, no sidx should be written at all. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-08-10avformat/gifdec: correct r_frame_rate for single frame gifsMichael Niedermayer
Fixes Ticket4650 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-07Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'Hendrik Leppkes
* commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a': asf: Use time_t where needed Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-07Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'Hendrik Leppkes
* commit '944f60866f507e3c0850ae9c2f30dac1da54587c': asfdec: read values properly Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-06avformat/matroskaenc: Avoid "for (int i" syntax for better compatibilityMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-05libavformat/matroska: Write stream durations in metadata, in the format of ↵Sasi Inguva
mkvmerge. Compute individual stream durations in matroska muxer. Write them as string tags in the same format as mkvmerge tool does. Signed-off-by: Sasi Inguva <isasi@google.com>
2015-08-04asf: Use time_t where neededLuca Barbato
gmtime takes a time_t not an uint64_t.
2015-08-04lavf/swf: Fix auto-detection of compressed files.Carl Eugen Hoyos
Fixes auto-detection of compressed swf files as in http://samples.ffmpeg.org/SWF/compressed-swf/ Reported by forum user Zard1096.
2015-08-04asfdec: read values properlyAlexandra Hájková
The length of BOOL values is 16 bits in the Metadata Object but 32 bits in the Extended Content Description Object. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-08-04lavf/mxfdec: support segmented frame layout as separate fields layoutMatthieu Bouron
According to S377M, segmented frame layout is identical to separate field layout except that the two fields are taken from a single scan of the incoming image, ie: they are coincident in time. Thus the resulting frame is progressive. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-02Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'Hendrik Leppkes
* commit 'fdbc544d29176ba69d67dd879df4696f0a19052e': asfdec: prevent the memory leak while reading metadata Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'Hendrik Leppkes
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672': asfdec: remove improper assignement that caused wrong timestamps Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961'Hendrik Leppkes
* commit '78491fe8cfed83d2aead95dafe26f0d3f999e961': asfdec: do not export empty metadata Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914'Hendrik Leppkes
* commit 'cd4d9df22738e6f147521ccb72c7930db6050914': asfdec: free AVDictionaries properly when closing the demuxer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-02asfdec: prevent the memory leak while reading metadataAlexandra Hájková
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-08-02avformat/mov: fix regression in processing .aax filesVesselin Bontchev
Commit 0a551cbe introduced "activation_bytes" option, and not specifying this option (while calling ffmpeg / ffprobe) causes the program to quit early. Before this commit, ffprobe was capable of processing metadata in .aax files. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-01lavf/http: Implement server side network code.Stephan Holljes
add http_accept, add http_handshake and move handshake logic there, handle connection closing. Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
2015-08-01lavf/tcp: increase range for listen and call the underlying socket ↵Stephan Holljes
operations accordingly Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
2015-08-01lavf/tcp: add tcp_acceptStephan Holljes
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>