summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-03-08
|\ | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/concatdec: reindent after last commit. lavf/concatdec: more reliable test for absolute URLs. lavf: add subfile protocol. lavfi/af_atempo: clear references before returning error. lavd/xv: take aspect ratio into account. lavc/pthread: copy packet side data. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf/concatdec: reindent after last commit.Nicolas George2014-03-08
| |
| * lavf/concatdec: more reliable test for absolute URLs.Nicolas George2014-03-08
| | | | | | | | | | | | | | ff_make_absolute_url() recognizes the "://" pattern usual in HTTP-like protocols, but consider relative URLs starting with just the protocol name or using the comma syntax for options.
| * lavf: add subfile protocol.Nicolas George2014-03-08
| |
| * lavfi/af_atempo: clear references before returning error.Nicolas George2014-03-08
| | | | | | | | | | | | | | Once the frame has been given to ff_filter_frame(), it can no longer be used, even on error. Fix trac ticket #3430.
| * lavd/xv: take aspect ratio into account.Nicolas George2014-03-08
| |
| * lavc/pthread: copy packet side data.Nicolas George2014-03-08
| |
* | Make 32bit RGB dshow input opaque.Don Moir2014-03-08
| |
* | Set codec_tag in dshow device, needed to distinguish between YUV and YVU.Carl Eugen Hoyos2014-03-08
|/ | | | Fixes ticket #3447.
* avcodec/vorbis: fix decoding of single element huffman treesMichael Niedermayer2014-03-08
| | | | | | Fixes Ticket2893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()Michael Niedermayer2014-03-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/wmadec: initialize max_exponent to valid valuesMichael Niedermayer2014-03-08
| | | | | | Fixes generation of NaN output Fixes: nan_example.wma Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-08
|\ | | | | | | | | | | | | * qatar/master: fic: Properly handle skip frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fic: Properly handle skip framesDerek Buitenhuis2014-03-07
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'Michael Niedermayer2014-03-08
|\| | | | | | | | | | | | | | | | | | | * commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a': matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: cosmetics: Fix "attachement" vs. "attachment" typoDiego Biurrun2014-03-07
| |
* | Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | | | | | * commit '84cfce9f99805a144df684417e166c1ae6f95421': matroskadec: K&R formatting cosmetics Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: K&R formatting cosmeticsKeiji Costantini2014-03-07
| | | | | | | | | | | | Also sort #includes into canonical order. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | doc: fix typocompn2014-03-07
| |
* | dxva2_vc1: include the start code in wMBbitOffsetHendrik Leppkes2014-03-07
| | | | | | | | | | | | This resolves a decoding failure on Intel GPUs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_vc1: fix intensity compensation condition with interlaced fieldsHendrik Leppkes2014-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * qatar/master: rtmppkt: Rename the ts_delta field to ts_field Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Rename the ts_delta field to ts_fieldMartin Storsjö2014-03-07
| | | | | | | | | | | | | | | | | | | | | | Based on a suggestion by Martin Panter. This is more descriptive, since it's the actual timestamp field from the RTMP packet, which might or might not be a delta depending on context (in some packets it's a delta, in some packets it's an absolute timestamp, and in some packets it's 0xffffff to indicate that the actual delta or absolute timestamp is transmitted separately). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3': rtmppkt: Properly handle extended timestamps when writing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Properly handle extended timestamps when writingMartin Panter2014-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * commit '48cfb5f4114048383a4ee85b2f500eefce24cad2': rtmppkt: Add a descriptive comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Add a descriptive commentMartin Panter2014-03-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | * commit '5b2ad78f97d43299adcb038c04346999fe9b196c': rtmppkt: Handle extended timestamp field even for one-byte header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmppkt: Handle extended timestamp field even for one-byte headerMartin Panter2014-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related fix in "rtmpdump": https://repo.or.cz/w/rtmpdump.git/commitdiff/79459a2 Adobe's RTMP specification (21 Dec 2012), section 5.3.1.3 ("Extended Timestamp"), says "this field is present in Type 3 chunks". Type 3 chunks are those with the one-byte header size. This resolves intermittent hangs and segfaults caused by the read function, and also includes an untested fix for the write function. The read function was tested with ABC (Australia) News 24 streams, however they are probably restricted to only Australian internet addresses. Some of the packets at the start of these streams seem to contain junk timestamp fields, often requiring the extended field. Test command: avplay rtmp://cp81899.live.edgefcs.net/live/news24-med@28772 Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | | | | | * commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7': dict: K&R formatting cosmetics Conflicts: libavutil/dict.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dict: K&R formatting cosmeticsPatrice Clement2014-03-07
| |
* | doc/APIchanges: update versions & hashesMichael Niedermayer2014-03-07
| |
* | dxva2_h264: add a workaround for old intel GPUsHendrik Leppkes2014-03-07
| | | | | | | | | | | | | | | | | | | | Old Intel GPUs expect the reference frame index to the actual surface, instead of the index into RefFrameList as specified by the spec. This workaround should be set when using one of the "ClearVideo" decoder devices. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_h264: set the correct ref frame index in the long slice structHendrik Leppkes2014-03-07
| | | | | | | | | | | | | | | | | | | | The latest H.264 DXVA specification states that the index in this structure should refer to a valid entry in the RefFrameList of the picture parameter structure, and not to the actual surface index. Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | * qatar/master: libx265: Support API version 9 See: 69ead9af7519796eebbc452fbbdb43af8d846173 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Support API version 9Derek Buitenhuis2014-03-06
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | * commit 'b66382101cff33e2ce66500327a90d0a105eedeb': dxva2: Increase maximum number of slices for mpeg2 See: bceeccc648baf94a02b7b2c53e44bf77a47773ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Increase maximum number of slices for mpeg2Rainer Hochecker2014-03-06
| | | | | | | | | | | | | | | | | | Some content requires an higher number of slices in order to render properly. Rise the number to 1024 and warn if ever it exceeds. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | * commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8': mxf: Return meaningful errors Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Return meaningful errorsLuca Barbato2014-03-06
| |
* | Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6': mxf: Parse random index pack Conflicts: libavformat/mxfdec.c See: f5ed83c3831fcaca0f87cd67ca743946a54023d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Parse random index packPaul B Mahol2014-03-06
| | | | | | | | | | | | | | | | | | | | Get the last partition offset and use it when footer partition offset is missing. Footer partition may not be present and even if present footer partition offset may not be set in any partition except last one. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '570af382eea902afe09f3562e5e1b483981cca7e': mxf: Handle identification metadata Conflicts: libavformat/mxfdec.c See: 25b143aa7bd60d348a449be64dadab61f0c7d068 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Handle identification metadataMatthieu Bouron2014-03-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416': mxf: Set audio packets pts Conflicts: libavformat/mxfdec.c See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Set audio packets ptsMatthieu Bouron2014-03-06
| | | | | | | | | | | | | | | | | | | | | | Extrapolate audio timestamps based on the number of samples demuxed. Deal with some MXF nastiness involving fractional number of samples per EditUnit when seeking (the specs handwave this away). Further fixes from Tomas Härdin. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32': mxf: Introduce ff_mxf_get_samples_per_frame Conflicts: libavformat/mxf.c libavformat/mxf.h See: 906a2638139bfcce17d423cfa3a8ee633b38a2af Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Introduce ff_mxf_get_samples_per_frameMatthieu Bouron2014-03-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | * commit 'd48430c367947a64647c6959cf472f2c01778b17': build: Let the SVQ3 decoder depend on the H.264 decoder Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Let the SVQ3 decoder depend on the H.264 decoderDiego Biurrun2014-03-06
| | | | | | | | | | | | | | The SVQ3 decoder reuses large parts of the H.264 decoder so it makes no sense to enable the former but not the latter. Also drop unnecessary h263.o object from SVQ3 decoder object list.