summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | avcodec/internal: Add () to argument of FF_SIGNBIT() to ensure correct order ↵Michael Niedermayer2014-11-181-1/+1
| | | | | | | | | | | | or operations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'Michael Niedermayer2014-11-181-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2007082d2db25f9305b8a345798b840ea7784fdb': mov: check ff_get_wav_header() return value Conflicts: libavformat/mov.c See: 6d55a40b00801899f7975b22401bdd96bbc228af Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: check ff_get_wav_header() return valueVittorio Giovara2014-11-181-3/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 717497
* | Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'Michael Niedermayer2014-11-185-7/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa': lavc: fix bitshifts amount bigger than the type Conflicts: libavcodec/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix bitshifts amount bigger than the typeVittorio Giovara2014-11-185-7/+10
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638
* | Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'Michael Niedermayer2014-11-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '771656bd85416cd6308b11aed6f2c69a8db9c21b': libvpxenc: clean memory on error Conflicts: libavcodec/libvpxenc.c See: 104b1d9e103f90485e894b20dd5bb3f1964fe5f3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvpxenc: clean memory on errorVittorio Giovara2014-11-181-0/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733795
* | Merge commit 'a28468d0daf4be14761c16a3ddd33266b2380123'Michael Niedermayer2014-11-180-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'a28468d0daf4be14761c16a3ddd33266b2380123': librtmp: append the correct field to the string See: d1970929b5f8b873aac171586343c9d8142897ad Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * librtmp: append the correct field to the stringVittorio Giovara2014-11-181-1/+1
| | | | | | | | | | | | | | Also prevent a NULL pointer dereference. CC: libav-stable@libav.org Bug-Id: CID 1250329 / CID 1250331
* | Merge commit '9257692ac15eff7b07540c1f61cebde0d8823fbd'Michael Niedermayer2014-11-183-8/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9257692ac15eff7b07540c1f61cebde0d8823fbd': lavf: Only initialize s->offset once when using avoid_negative_ts make_zero Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Only initialize s->offset once when using avoid_negative_ts make_zeroMartin Storsjö2014-11-172-2/+3
| | | | | | | | | | | | | | | | | | | | When given a stream starting at dts=0, it would previously consider s->offset as uninitialized and set an offset when the second packet was written, ending up writing two packets with dts=0. By initializing this field to AV_NOPTS_VALUE, we make sure that we only initialize it once, on the first packet. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avdevice/oss_audio: avoid strerror() and errbufMichael Niedermayer2014-11-171-6/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c'Michael Niedermayer2014-11-172-0/+411
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'c302d034ba2690a935df8bf7e4f5d44ed86e8d5c': tools: Add a sidxindex tool Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tools: Add a sidxindex toolMartin Storsjö2014-11-172-0/+411
| | | | | | | | | | | | | | This tool can write an MPD file for fragmented MP4 files with a sidx index at the start of the file. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'Michael Niedermayer2014-11-172-24/+93
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5': movenc: Allow writing a DASH sidx atom at the start of files Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow writing a DASH sidx atom at the start of filesMartin Storsjö2014-11-172-26/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mapped to the faststart flag (which in this case perhaps should be called "shift and write index at the start of the file"), which for fragmented files will write a sidx index at the start. When segmenting DASH into files, there's usually one sidx at the start of each segment (although it's not clear to me whether that actually is necessary). When storing all of it in one file, the MPD doesn't necessarily need to describe the individual segments, but the offsets of the fragments can be fetched from one large sidx atom at the start of the file. This allows creating files for the DASH ISO BMFF on-demand profile. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3847f3ab58b3b74604807394247bf68827258103'Michael Niedermayer2014-11-171-4/+0
|\ \ | |/ | | | | | | | | | | * commit '3847f3ab58b3b74604807394247bf68827258103': movenc: Add tfra entries for all tracks in a moof Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add tfra entries for all tracks in a moofMartin Storsjö2014-11-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only tfra entries were added for the first track in each moof. The frag_info array used for tfra can also be used for writing other kinds of fragment indexes, where it's more important to include all tracks. When the separate_moof option is enabled (as in ismv), we write a separate moof for each track, so this doesn't make any difference in that case. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'Michael Niedermayer2014-11-176-3/+779
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'fe5e6e34c05e274f98528be4f77f3c474473f977': lavf: Add an MPEG-DASH ISOFF segmenting muxer Conflicts: Changelog libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add an MPEG-DASH ISOFF segmenting muxerMartin Storsjö2014-11-176-3/+779
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly to serve as a reference example on how to segment the output from the mp4 muxer, capable of writing the segment list in four different ways: - SegmentTemplate with SegmentTimeline - SegmentTemplate with implicit segments - SegmentList with individual files - SegmentList with one single file per track, and byte ranges The muxer is able to serve live content (with optional windowing) or create a static segmented MPD. In advanced cases, users will probably want to do the segmenting in their own application code. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'Michael Niedermayer2014-11-174-3/+83
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2ded57371abead879bcee56da5131e5fac0d17ef': movenc: Add support for writing sidx atoms for DASH segments Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add support for writing sidx atoms for DASH segmentsMartin Storsjö2014-11-174-3/+83
| | | | | | | | | | | | | | | | | | | | A flag "dash" is added, which enables the necessary flags for creating DASH compatible fragments. When this is enabled, one sidx atom is written for each track before every moof atom. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8'Michael Niedermayer2014-11-172-29/+49
|\ \ | |/ | | | | | | | | | | * commit '2d9d6afb8d2f284f5e620ecc19f643d5cd3facb8': movenc: Factorize adding fragment info into a separate function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Factorize adding fragment info into a separate functionMartin Storsjö2014-11-172-29/+49
| | | | | | | | | | | | | | | | By calling this after writing the moof the first time (for calculating the moof size), we can avoid intermediate storage of tfrf_offset in MOVTrack. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6'Michael Niedermayer2014-11-171-1/+1
|\ \ | |/ | | | | | | | | | | * commit '0f9eb9165bb7d7982fdedf64f6bcec856f1bedd6': movenc: Include empty tracks in iods when writing fragmented mp4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Include empty tracks in iods when writing fragmented mp4Martin Storsjö2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | When writing fragmented streams with an empty initial moov, we won't have any samples in any tracks when writing the moov atom, thus trust that any tracks that are added actually will be present. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/lcldec: support rgb24 with width%4 != 0Michael Niedermayer2014-11-171-2/+4
| | | | | | | | | | | | Fixes Ticket1216 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Read (display) aspect ratio from mxf files.Carl Eugen Hoyos2014-11-173-0/+14
| | | | | | | | Fixes ticket #4107.
* | configure: Enable mpcodec compilation without inline asm.Matthew Oliver2014-11-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpcodecs: Use _INLINE guards for inline asm.Matthew Oliver2014-11-176-29/+29
| | | | | | | | | | | | Enabled compilation with compiler without inline asm support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: remove unused variableMichael Niedermayer2014-11-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c64f3615118d757dcf76040fe5407bf2b3883206'Michael Niedermayer2014-11-171-14/+19
|\ \ | |/ | | | | | | | | | | * commit 'c64f3615118d757dcf76040fe5407bf2b3883206': flvenc: Send new metadata when FLAG_METADATA_UPDATED is set. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.Andrew Stone2014-11-171-14/+19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'Michael Niedermayer2014-11-171-108/+121
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4d0cd5f58c892276716f46f4b2702915e5018215': flvenc: move metadata updates into a single function Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvenc: move metadata updates into a single functionAndrew Stone2014-11-171-90/+103
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e'Michael Niedermayer2014-11-170-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e': hevc: remove superfluous assignments and checks Conflicts: libavcodec/hevc.c See: 83976e40e89655162e5394cf8915d9b6d89702d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: remove superfluous assignments and checksAnton Khirnov2014-11-171-8/+0
| |
* | Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31'Michael Niedermayer2014-11-171-5/+2
|\ \ | |/ | | | | | | | | | | * commit 'eac3ac1fe0774b65316852616b2672702dbc3f31': hevc: eliminate an unneeded intermediate variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: eliminate an unneeded intermediate variableAnton Khirnov2014-11-171-5/+2
| |
* | Merge commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc'Michael Niedermayer2014-11-171-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'eb335f3c5ce37f2b93c993e28404d113bee843bc': hevc: reduce variable scope Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: reduce variable scopeAnton Khirnov2014-11-171-5/+6
| | | | | | | | | | Also, collapse the array into a scalar, since only one value is needed at a time.
* | Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'Michael Niedermayer2014-11-171-12/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8': hevc: further reduce code duplication in hls_prediction_unit() Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: further reduce code duplication in hls_prediction_unit()Anton Khirnov2014-11-171-12/+6
| |
* | Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'Michael Niedermayer2014-11-171-65/+51
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139': hevc: reduce code duplication in hls_prediction_unit() Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: reduce code duplication in hls_prediction_unit()Anton Khirnov2014-11-171-66/+51
| |
* | Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'Michael Niedermayer2014-11-171-40/+13
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'de1f8ead8993512925a3ee6c7491473414419e55': hevcdsp_template: templatize transquant_bypass Conflicts: libavcodec/hevcdsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevcdsp_template: templatize transquant_bypassAnton Khirnov2014-11-171-40/+13
| |
* | Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'Michael Niedermayer2014-11-171-3/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '16c01fb4347312b6d29a6498dad627665b96a20e': hevc: remove an unused function parameter Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: remove an unused function parameterAnton Khirnov2014-11-171-3/+2
| |
* | Merge commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7'Michael Niedermayer2014-11-170-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7': hevc: remove a redundant line See: 83976e40e89655162e5394cf8915d9b6d89702d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud