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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-05lavf/http: add proof-of-concept http server.Stephan Holljes
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com> Reviewed-By: Nicolas George <george@nsup.org>
2015-04-05avcodec: add unpack packed B-frames bitstream filterAndreas Cadhalpun
Fixes Ticket #2913 Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05webmdashenc: Support for live stream manifestsVignesh Venkatasubramanian
This patch adds support for creating DASH manifests for WebM Live Streams. It also updates the documentation and adds a fate test to verify the behavior of the new muxer flag. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05Merge commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1'Michael Niedermayer
* commit 'aa1a1b2496cf3ca817e78e27bd0262a50adb91a1': avconv: Avoid theoretical NULL dereferences See: d768f8f5cfe876cd8eedb045eeb87e307ac4a674 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05matroskadec: Add support for parsing live header filesVignesh Venkatasubramanian
This patch adds support for parsing live files (produced by -f webm_chunk) which contains only the headers but no packets. This is only used when using -f webm_dash_manifest. There will be a follow up patch which adds live support to WebM DASH Manifest muxer. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: lavf/mov: Do not overread iTunes metadata. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avconv: Avoid theoretical NULL dereferencesHimangi Saraogi
Bug-Id: CID 1292519 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-04avcodec/h264_refs: More completely clear slice contexts in ↵Michael Niedermayer
ff_h264_remove_all_refs() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading ↵Michael Niedermayer
mode Fixes Ticket4408 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avcodec/h264_mb: assert that frame waiting code actually references 2 ↵Michael Niedermayer
fields/1 frame Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avcodec/h264_refs: Do not set reference to things which dont existMichael Niedermayer
Fixes deadlock Fixes Ticket4428 Fixes Ticket4429 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04lavf/mov: Do not overread iTunes metadata.Carl Eugen Hoyos
Fixes ticket #4425.
2015-04-04avcodec/h264_slice: make current_slice reset code more strictMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avcodec/h264: use goto end instead of return for hwaccel fails as wellMichael Niedermayer
This is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avformat/rtsp: Fix null pointer dereferenceHimangi Saraogi
This fixes CID 1257827. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04lavf/assenc: style nitsRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04matroskadec: export cover art correctlywm4
Generally, libavformat exports cover art pictures as video streams with 1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported it as attachment with codec_id set to AV_CODEC_ID_MJPEG. Obviously, this should be consistent, so change the Matroska demuxer to export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream. Matroska muxing is probably incorrect too. I know that it can create broken files with an audio track and just 1 video frame when e.g. remuxing mp3 with APIC to mkv. But for now this commit does not change anything about muxing, and also continues to write attachments with AV_CODEC_ID_MJPEG should the muxer application have special knowledge that the Matroska is broken in this way. Fixes trac #4423. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04mpeg4: use a self-explanatory #define MAX_NVOP_SIZEAndreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: Fix codec fps diplay for very small fps. lavf/mpeg: Support alaw in Hikvision CCTV recordings. lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04avcodec/h264: silence ER warning when no slice threads are usedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04MAINTAINERS: add Reynaldo as a Twitter maintainerLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-04-04avcodec/h264: reenable ER except with slice threads by defaultMichael Niedermayer
ER with slice threads is buggy and since the merge of the libav cleanup broken as the ER context which is supposed to be per frame has been placed in the slice context, so there are multiple per frame which does not work as is. Theres no bug report about ER with frame threads. If someone knows of a case where it crashes / fails without slice threads please mail me and open a ticket on trac. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04Merge commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c'Michael Niedermayer
* commit 'a4d34e218f548d381e09c483e8dc6ad18a8d571c': h264: disable ER by default Conflicts: libavcodec/h264.c libavcodec/h264_picture.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04Merge commit '3892bdab9b652eb003ab95e167f1765e0b0ea035'Michael Niedermayer
* commit '3892bdab9b652eb003ab95e167f1765e0b0ea035': avconv: do not overwrite the stream codec context for streamcopy Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-04ffmpeg: Fix extradata allocationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03tests/fate/hevc: Use a bitexact scaler in the hevc param change test to ↵Michael Niedermayer
avoid failing on non x86 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03Merge commit 'b2965ec7761c99e8ef9c217a28a517e37f010480'Michael Niedermayer
* commit 'b2965ec7761c99e8ef9c217a28a517e37f010480': FATE: add a test for parameter changes in HEVC Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'Michael Niedermayer
* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c': hevc: make sure no dangling pointers remain around on VPS/SPS change Conflicts: libavcodec/hevc_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'Michael Niedermayer
* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854': hevc: do not change the VPS if its contents are the same Conflicts: libavcodec/hevc_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03Merge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'Michael Niedermayer
* commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa': hevc: export stream parameters from extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03Fix codec fps diplay for very small fps.Carl Eugen Hoyos
Fixes codec banner for the sample from ticket #4369.
2015-04-03lavf/mpeg: Support alaw in Hikvision CCTV recordings.Carl Eugen Hoyos
Fixes a sample from ticket #4182.
2015-04-03lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.Carl Eugen Hoyos
Fixes a sample from ticket #4182.
2015-04-03Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'Michael Niedermayer
* commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5': hevc: split out setting AVCodecContext parameters Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'Michael Niedermayer
* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0': mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03cmdutils: fix "Commmand" typoLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2015-04-03mpeg4: only show the divx_packed warning, when a packed frame is presentAndreas Cadhalpun
Otherwise it is shown even after the file was fixed with avidemux, because the userdata string still ends with 'p'. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03ffmpeg: Fix indentationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03ffmpeg: last frame duplication heuristicMichael Niedermayer
This improves the last frames duration with CFR and when the input durations are inaccurate or missing Fixes Ticket4119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()Rong Yan
add marcos VEC_FMERGEH() VEC_FMERGEL() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03filtfmts: Avoid null pointer dereferenceHimangi Saraogi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03libavformat/mxf.c: Relaxed ProRes patternSteve Dierker
I found another MXF File containing ProRes with the following codec_uls: 060E2B34040101010E04020102110500 Therefor I relaxed the pattern. Related to issue #4349 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03h264: disable ER by defaultAnton Khirnov
The way it is currently designed is fundamentally unsafe and cannot be reasonably fixed without completely rewriting it.
2015-04-03avconv: do not overwrite the stream codec context for streamcopyAnton Khirnov
Since we are not doing encoding, there is no point in ever touching the separate encoding context. Always use the stream codec context. Fixes writing attachments. CC:libav-devel@libav.org
2015-04-03FATE: add a test for parameter changes in HEVCAnton Khirnov
2015-04-03hevc: make sure no dangling pointers remain around on VPS/SPS changeAnton Khirnov
2015-04-03hevc: do not change the VPS if its contents are the sameAnton Khirnov
This is the same as is done for SPS.
2015-04-03hevc: export stream parameters from extradataAnton Khirnov
This allows the callers to have a hint of the probable stream parameters without actually decoding anything.
2015-04-03hevc: split out setting AVCodecContext parametersAnton Khirnov
Additionally always set the software pixel format, so it's available even if ff_get_format() is not called later. This will be useful for exporting stream parameters from init().
2015-04-03mpegtsenc: Take max_delay into account when buffering multiple audio packets ↵Martin Storsjö
into one PES packet Make sure we don't buffer up more than max_delay worth of data before writing a PES packet, even if pes_payload_size is set to a larger value. Signed-off-by: Martin Storsjö <martin@martin.st>