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-01-05Factorize avpriv_mirror() outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05avfilter/vf_sab: fix filtering tiny imagesMichael Niedermayer
Fixes out of array reads Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-04ffserver: reindent rtsp_cmd_setup()Reynaldo H. Verdejo Pinochet
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2015-01-04ffserver: reflow rtsp_cmd_setup()Reynaldo H. Verdejo Pinochet
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2015-01-04ffserver: drop redundant else clauseReynaldo H. Verdejo Pinochet
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2015-01-04ffserver: reindent compute_status()Reynaldo H. Verdejo Pinochet
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2015-01-04ffserver: reflow compute_status()Reynaldo H. Verdejo Pinochet
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2015-01-04avcodec/libxvid: check for av_malloc*() failuresMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03avcodec/ljpegenc: Check for av_malloc_array() failureMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03avformat/westwood_vqa: Remove unneeded castMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03avformat/movenc: fix DELAY_MOOVMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03tests/regression-funcs: Remove hardcoded threads 1Michael Niedermayer
The tests which use encoders which either use slices or store the encoder thread count keep a hardcoded value of 1 This will help test more threading code like in filters Found-by: ubitux Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit 'f2ad1495f23376ce61542967f4fc14205f284d40'Michael Niedermayer
* commit 'f2ad1495f23376ce61542967f4fc14205f284d40': avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03build: require libxcb >= 1.4Clément Bœsch
Fixes Ticket #4139
2015-01-03Merge commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c'Michael Niedermayer
* commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c': sidxindex: Remove parsing that isn't necessary any longer Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03configure: bump yearJames Almer
Happy new year!
2015-01-03Merge commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a'Michael Niedermayer
* commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a': sidxindex: Don't adjust the Period start time depending on the track start time Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750'Michael Niedermayer
* commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750': dashenc: Use pts for MPD timeline timestamps Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011'Michael Niedermayer
* commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011': dashenc: Use delay_moov Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'Michael Niedermayer
* commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe': movenc: Get rid of a hack for updating the dvc1 atom Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'Michael Niedermayer
* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b': movenc: Add an option for delaying writing the moov with empty_moov Conflicts: libavformat/movenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03avformat/movenc: Use cluster timestamps when available in edtsMichael Niedermayer
Also print both if they differ Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'Michael Niedermayer
* commit 'c725faebda9a516766d94c33b07972ab0f70cf93': movenc: Use start_dts/cts instead of cluster[0] for writing edit lists Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03avisynth: Use RTLD_LOCAL instead of RTLD_GLOBALMartin Storsjö
There shouldn't be any need to add the loaded libraries to the global symbol namespace. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03Merge commit '724cbea7193945fe5a5b4dea8ede344803572844'Michael Niedermayer
* commit '724cbea7193945fe5a5b4dea8ede344803572844': movenc: Remove an unnecessary condition when flushing fragments Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'Michael Niedermayer
* commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e': movenc: Factorize writing ftyp and other identification tags to a separate function Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03sidxindex: Remove parsing that isn't necessary any longerMartin Storsjö
When we don't adjust the Period start time, we don't need to parse the earliest_presentation_time from the sidx boxes either. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03sidxindex: Don't adjust the Period start time depending on the track start timeMartin Storsjö
This was only necessary to get playback to start with dash.js 1.2.0, it has been fixed in the git version. The previous behaviour was incorrect - the Period's start time is irrespective of the actual first timestamp of the contents within the period. The Period start time only says when, within the global timeline, this particular piece should start to be played back. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03dashenc: Use pts for MPD timeline timestampsMartin Storsjö
This should be more correct. This also should give more sensible switching between video streams with different amount of b-frame delay. The current dash.js release (1.2.0) fails to start playback of such files from the start (if the start pts is > 0), but this has been fixed in the current git version of dash.js. Also enable the use of edit lists, so that streams in many cases start at pts=0. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03dashenc: Use delay_moovMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03movenc: Get rid of a hack for updating the dvc1 atomMartin Storsjö
Use the more generic approach with the delay_moov flag, instead of having a update mechanism specific to this one single atom. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03movenc: Add an option for delaying writing the moov with empty_moovMartin Storsjö
This delays writing the moov until the first fragment is written, or can be flushed by the caller explicitly when wanted. If the first sample in all streams is available at this point, we can write a proper editlist at this point, allowing streams to start at something else than dts=0. For AC3 and DNXHD, a packet is needed in order to write the moov header properly. This isn't added to the normal behaviour for empty_moov, since the behaviour that ftyp+moov is written during avformat_write_header would be changed. Callers that split the output stream into header+segments (either by flushing manually, with the custom_frag flag set, or by just differentiating between data written during avformat_write_header and the rest) will need to be adjusted to take this option into use. For handling streams that start at something else than dts=0, an alternative would be to use different kinds of heuristics for guessing the start dts (using AVCodecContext delay or has_b_frames together with the frame rate), but this is not reliable and doesn't necessarily work well with stream copy, and wouldn't work for getting the right initialization data for AC3 or DNXHD either. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03movenc: Use start_dts/cts instead of cluster[0] for writing edit listsMartin Storsjö
This allows writing edit lists even when track->entry == 0, if the start times have been set. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03movenc: Remove an unnecessary condition when flushing fragmentsMartin Storsjö
If fragments == 0 it means we haven't written any moov atom yet. If the empty_moov flag is set, we already have written an empty moov atom at startup. Thus, the check for empty_moov is redundant. This is in preparation for allowing writing the moov atom later, even when using the empty moov flag. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-03movenc: Factorize writing ftyp and other identification tags to a separate ↵Martin Storsjö
function Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-02avutil/camellia: cosmetic fixesGiorgio Vazzana
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avutil/camellia: use K[2] instead of *K in generate_round_keys()Giorgio Vazzana
Additionally, change parameters order. Signed-off-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avutil/camellia: make LR128() more robustGiorgio Vazzana
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avutil/camellia: fix documentation for av_camellia_crypt()Giorgio Vazzana
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02lavd/lavfi: allow to extract subcc.Nicolas George
Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02libavutil: Added Camellia symmetric block cipherSupraja Meedinti
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com> Previous version of this patch reviewed-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02Changelog: Add cropdetect non 8bppMichael Niedermayer
Suggested-by: Reimar Previous patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avformat/mov: reindent after previous commitClément Bœsch
2015-01-02avformat/mov: move edit list heuristics into mov_build_index()Clément Bœsch
mov_read_elst() is now only responsible from storing the table in a data structure; this is consistent with other table readers functions.
2015-01-02avcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_infoMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avcodec/mpeg12dec: Recalculate SAR unconditionallyMichael Niedermayer
Fixes Ticket4161 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avcodec/mpeg12dec: Move user data debug code out of unrelated if (buf_size > 29)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02avformat/flvdec: remove duplicated line errorClément Bœsch
Fix typo regression since 5c37ffca59e7eb1b8768f237deb35a9936c1a0a5 Found-By: cousin_luigi
2015-01-01Merge remote-tracking branch 'cus/stable'Michael Niedermayer
* cus/stable: ffplay: dump format before selecting streams ffplay: add support for stream specifiers in -ast, -vst, -sst options ffplay: remove unused no_background from videostate ffplay: remove flushed state from decoder context Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01avformat/flvdec: use named identifier instead of literal numbers as return ↵Michael Niedermayer
values Signed-off-by: Michael Niedermayer <michaelni@gmx.at>