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-02-16avformat/mov: Bypass av_add_index_entry()Michael Niedermayer
The new mov code uses a temporally non sorted index since 4abfa387b8234736f6e0e541951e3d5eb60eb843 and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted. Reverting 4abfa387b8234736f6e0e541951e3d5eb60eb843 and this commit would be a alternative fix as would be various other options. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'Michael Niedermayer
* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843': mov: Change DTS-based seek into CTS-based seek. Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'Michael Niedermayer
* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6': ape: Use the proper variable type Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15Merge commit '53367b34e1156614e82ef7af888928f322566f88'Michael Niedermayer
* commit '53367b34e1156614e82ef7af888928f322566f88': rtp: h264: Drop the asserts Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'Michael Niedermayer
* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7': rtp: h264: Move FU-A NAL parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'Michael Niedermayer
* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0': rtp: h264: Move STAP-A NAL parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'Michael Niedermayer
* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b': rtp: h264: Move parse_sprop_parameter_sets parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'Michael Niedermayer
* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c': rtp: h264: Move profile_level_id parsing to a function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15mov: Change DTS-based seek into CTS-based seek.Yusuke Nakamura
CTS-based seek is reasonable since player requests frames in output order not coded order. This change fixes seek to a keyframe within consecutive keyframes. Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS respectively, and both two frames are a keyframe. If you try to seek on PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This is obviously undesirable. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"Michael Niedermayer
Found-by: Loriker Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15avformat/rtpdec: DV depacketizer (RFC 6469)Thomas Volkert
Tested with live555 RTSP server Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15ape: Use the proper variable typeLuca Barbato
Avoid an unsigned underflow. Bug-Id: 1041122 CC: libav-stable@libav.org
2015-02-15rtp: h264: Drop the assertsLuca Barbato
2015-02-15rtp: h264: Move FU-A NAL parsing to a functionLuca Barbato
2015-02-15rtp: h264: Move STAP-A NAL parsing to a functionLuca Barbato
2015-02-15rtp: h264: Move parse_sprop_parameter_sets parsing to a functionLuca Barbato
2015-02-15rtp: h264: Move profile_level_id parsing to a functionLuca Barbato
2015-02-15ogg: check memory allocationsFederico Tomassetti
Bug-Id: CID 1257795 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-15rtpdec: experimental VP9 depacketizer (draft 0)Thomas Volkert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15avformat/matroskaenc: add allow_raw_vfw and disable it by defaultMichael Niedermayer
Based on complaint by wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avformat/gif: use first packet palette as global for PAL8Clément Bœsch
This will allow the payload in PAL8 packets to not contain 768B of local palette (which is not LZW compressed).
2015-02-14avformat/gif: simplify gif_image_write_header() prototypeClément Bœsch
2015-02-14avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184)Gilles Chanteperdrix
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14mov: Fix compilation with DEBUG enabledDiego Biurrun
2015-02-14avformat/rtpdec_mpeg12: add robust MPEG audio depacketization (RFC 5219)Gilles Chanteperdrix
Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avformat: Don't anonymously typedef structsDiego Biurrun
2015-02-14avformat/matroskaenc: Do not use native mode for raw RGBMichael Niedermayer
This fixes generating totally unplayable files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avformat/matroskaenc: fix handling of VFW style raw rgbMichael Niedermayer
raw rgb uses 0 as codec tag in "VFW", the code assumed 0 means error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avformat/mov: print a warning if parsing udta failedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13avformat/mov: Heuristically detect raw udtaMichael Niedermayer
Fixes tkhd+moov fragment provided by koda Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13avformat/rtsp: parse lang attribute in SDPGilles Chanteperdrix
Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13avformat/rtpdec: add T.140 RTP depacketization (RFC 4103)Gilles Chanteperdrix
Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13avformat/rtsp: allow receiving subtitles via RTPGilles Chanteperdrix
Reviewed-by: Thomas Volkert <silvo@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13avformat/mpegtsenc: Do not create invalid files from annex b streams without ↵Michael Niedermayer
SPS/PPS use global headers to create SPS/PPS when they are available Fixes Ticket4248 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12rtpdec_hevc: correct parsing of aggregated packetsThomas Volkert
reported by tim dot yao at amlogic dot com Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12avformat/matroskadec: fix IGNIDX handlingwm4
Just because the user requested the seek index to be ignored, we can't just skip essential headers. At least tags are often located at the end of the file, and the old code simply ignored the seekhead for all elements, not just the cue index. Also, it looks like it used the index even if IGNIDX was set if the cue index was located in the beginning of the file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12matroska: redo seekhead handlingwm4
In particular, this reads chained seekheads. This makes seeking faster in files which have the index indirectly linked through 2 seekheads. As a side-effect, this warns when reading level-1 (toplevel) elements multiple times (other than seekheads, clusters, and void/crc). Such elements are not valid and likely break everything. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11avformat/isom: add X-Com Radvision fourccPaul B Mahol
Fixes bug #4303. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-11Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'Michael Niedermayer
* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78': lavf: move internal fields from public to internal context Conflicts: libavformat/avformat.h libavformat/internal.h libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'Michael Niedermayer
* commit '1509c018bd5b054a2354e20021ccbac9c934d213': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'Michael Niedermayer
* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c': lavf: remove unused code Conflicts: libavformat/seek.c libavformat/seek.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10lavf: move internal fields from public to internal contextwm4
This is not an API change; the fields were explicitly declared private before. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-10mpegts: relax restrictions on matching the packet start in read_headerAnton Khirnov
analyze() is currently called both when probing and from read_header(). It determines the packet start by looking for the sync byte, followed by unset Transport Error Indicator and valid adaptation_field_control. This makes sense to do when probing, but once we already know the format is MPEG-TS, it is counterproductive to be so strict -- e.g. in some files the TEI might be set and analyze() might get called with a smaller buffer than the one used for probing, resulting in a failure.
2015-02-10libavformat: DNxHD in .mov, switch unspecified color_range to mpegKevin Wheatley
Avid prefers mpeg range [16-235] by default this change brings ffmpeg into line with that. To obtain the old behaviour use '-color_range jpeg' on the command line prior to the ouput filename. Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-09matroska: don't complain about unknown elementswm4
Matroska is an extensible format - unknown elements must be expected. It shouldn't complain about such elements to the user either; it'll just generate noise. The "error_recognition & AV_EF_EXPLODE" is completely, wrong why would it explode on valid files? It's still useful for debugging, so the message is left in place with a higher log level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-09avformat/utils: Fix division by 0Michael Niedermayer
Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-09avformat/mov: Check dimensions before setting aspectMichael Niedermayer
Fixes division by 0 Fixes: asan_heap-uaf_143f420_728_cov_1441472032_HDV_0113.MP4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08lavf: remove unused codewm4
Nothing uses it, and it provides no public API. Archeological finds: Commit 101036adb9 added the API. Commit a8dd8dc6e9 made mpegts.c use it. Commit af8aae3fa3 disabled it by default in mpegts.c. Commit ae2bb52cd2 removed all uses of this from mpegts.c. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-08Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* cehoyos/master: Fix standalone compilation of the mov muxer with --disable-optimizations. Merged-by: Michael Niedermayer <michaelni@gmx.at>