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
2013-03-28Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'Michael Niedermayer
* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107': AVOptions: make av_set_options_string() forward options to child objects win32: Use 64-bit fstat/lseek variants for MSVC as well win32: Make ff_win32_open more robust Conflicts: libavformat/os_support.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28estimate_timings_from_bit_rate: Check timebase and bitrateMichael Niedermayer
Fixes integer overflow and assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28electronicarts: check timebase, fix assertion failureMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Fix heap-buffer-overflow in matroska_parse_blockDale Curtis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28avformat: change some seeking related assert to av_assertsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27win32: Use 64-bit fstat/lseek variants for MSVC as wellHendrik Leppkes
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-27win32: Make ff_win32_open more robustReimar Döffinger
- Make MultiByteToWideChar fail when it encounters invalid encoding. Without this, invalid characters might just be skipped - When MultiByteToWideChar fails, assume the file name is in CP_ACP and open it via normal open function, even when the file will be written - When malloc fails return error instead of crashing Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-27win32: Allow other programs to open the same filesReimar Döffinger
In order to match Linux behaviour better our Windows-specific open() replacement should disable Windows default file locking. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-27ape: use correct context for the bit table printed in debugKostya Shishkov
2013-03-27Fix avisynth_context_create constructor error handling.d s
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27Support pcm_mulaw in Hikvision CCTV mpeg program streams.Carl Eugen Hoyos
Fixes decoding the sample from videolan trac ticket #8344.
2013-03-27Fix a typo in the Monkey's Audio demuxer.Carl Eugen Hoyos
2013-03-26Only test the first frame for missing aac_adtstoasc bistream filter.Carl Eugen Hoyos
Many players ignore broken aac frames, so don't abort mov or flv muxing when encountering one, just print a warning instead. Fixes ticket #2380.
2013-03-26mpegtsenc: Only test the first frame for missing h264_mp4toannexb filter.Carl Eugen Hoyos
Many video players accept broken frames in a transport stream, so there is no reason to abort remuxing when encountering one, just print a warning instead. Fixes ticket #1758.
2013-03-26Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'Michael Niedermayer
* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0': lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo Conflicts: libavcodec/h264_parser.c libavcodec/internal.h libavcodec/mpeg12.c libavcodec/utils.c libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'Michael Niedermayer
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f': ape: 3.80-3.92 decoding support h264: Remove an unused variable Conflicts: libavcodec/apedec.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideoMartin Storsjö
Also move the declaration to internal.h, and add restrict qualifiers to the declaration (as in the implementation). Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-25ape: 3.80-3.92 decoding supportKostya Shishkov
2013-03-25lavf/mux: add the flush_packets option.Nicolas George
Note: a lot of muxers already do the flushing explicitly.
2013-03-23libspeex: support ZygoAudio (quality 10 mode)Piotr Bandurski
Fixes "quality 10" mode from Ticket1873 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-22matroskadec: switch to av_assertMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-22img2: WebP supportMichael Niedermayer
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21AviSynth demuxer rewrite.d s
Dynamically loads the library itself, rather than through VfW. Supports AvxSynth on Linux and OS X. Supports the new colorspaces added in AviSynth 2.6 when used with AviSynth 2.6.
2013-03-21avformat/avs: increase probe score to preempt conflict with avxsynthMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21Merge remote-tracking branch 'cigaes/master'Michael Niedermayer
* cigaes/master: lavfi/vf_yadif: use standard options parsing. lavfi/vf_unsharp: use standard options parsing. lavfi/vf_transpose: use standard options parsing. lavfi/vf_pad: use standard options parsing. lavfi/vf_fps: use standard options parsing. lavfi/vf_fade: use standard options parsing. lavi/vf_drawbox: use standard options parsing. lavfi/vf_delogo: use standard options parsing. lavfi/vf_decimate: use standard options parsing. lavfi/vf_crop: use standard options parsing. lavfi/af_volume: use standard options parsing. lavfi/vf_tile: use standard options parsing. lavfi/avf_concat: use standard options parsing. lavfi: add common code to handle options parsing. lavf/vobsub: free index pseudo-packet. ffmpeg: fix freeing of sub2video frame. lavfi: add sine audio source. lavu/opt: add AV_OPT_TYPE_DURATION. lavfi/concat: fix silence duration computation. lavf/concatdec: support seeking. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21matroskadec: Add support for parsing Matroska ContentEncKeyIDFrank Galligan
This patch adds the enums for the ContentEncryption elements. This patch also adds support for parsing the ContentEncKeyID. The ContentEncKeyID is then base64 encoded and stored in the stream's metadata. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21lavf/vobsub: free index pseudo-packet.Nicolas George
2013-03-20lavf/concatdec: support seeking.Nicolas George
2013-03-20avformat: Fix infinite probing that reads the whole fileMichael Niedermayer
Fixes: otonajoshi_avformat_tries_to_load_whole.ts Reported-by: JEEB (on IRC) Thanks-to: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20av_find_stream_info: change read_size to 64bitMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20lavf: avformat_seek_file(): validate stream_index.Nicolas George
2013-03-20lavf/concatdec: fix possible leak in case of malloc failure.Nicolas George
Fix CID 747737.
2013-03-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtmp: Pass the parameters to do_adobe_auth in the right order Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20Merge commit '2c328a907978b61949fd20f7c991803174337855'Michael Niedermayer
* commit '2c328a907978b61949fd20f7c991803174337855': pixdesc: add a function for counting planes in a pixel format. avplay: remove the -debug option. Revert "asfenc: return error on negative timestamp" Conflicts: doc/APIchanges doc/ffplay.texi ffplay.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20rtmp: Pass the parameters to do_adobe_auth in the right orderMartin Storsjö
do_adobe_auth takes the parameters in the order "opaque, challenge". Due to the way they are treated, this didn't matter in the tested setups though - if both are set, we only use one. In the tested setups (Wowza and Akamai) either one of them were null or they were both set to the same value, which is why this worked before. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-19lavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxyStefano Sabatini
2013-03-19lmlm4: check packet_size against lower limit tooMichael Niedermayer
Fixes CID732224 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19avformat/tee: add forgotten ret assignmentMichael Niedermayer
Fixes CID991840 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19matroska_parse_frame: fix memleakMichael Niedermayer
Fixes CID991856 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19lavf: do not make a hard dep on internal subtitles helpers.Clément Bœsch
2013-03-19avidec: fix duration and bitrate of truncated filesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19Revert "asfenc: return error on negative timestamp"Anton Khirnov
This reverts commit d1bec33b46091546c5b2e6815210e73f87abf413, it breaks FATE.
2013-03-19lavf/mxfdec: read field dominance flagMatthieu Bouron
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19segment: copy metadataMichael Niedermayer
Fixes Ticket2230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-19Fix termination of mov_ch_layouts_wav array lookupThierry Foucu
Problem found using ASAN. In some case, the ff_mov_get_channel_layout_tag function will not find 0 as termination for lookup in the array mov_ch_layouts_wav. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18append_packet_chunked: remove outcommented codeMichael Niedermayer
our variant works fine and should be better also remove related unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'Michael Niedermayer
* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385': iff: validate CMAP palette size asfenc: return error on negative timestamp Conflicts: libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-18iff: validate CMAP palette sizeKostya Shishkov
Fixes CVE-2013-2495 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
2013-03-18asfenc: return error on negative timestampLuca Barbato
According to the specification the timestamp is represented by a 32bit unsigned. CC: libav-stable@libav.org
2013-03-18rmdec: flush audio packet on seekingMichael Niedermayer
Fixes Ticket1605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>