summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'Hendrik Leppkes2015-12-17
|\ | | | | | | | | | | | | * commit 'e02de9df4b218bd6e1e927b67fd4075741545688': lavc: export Dirac parsing API used by the ogg demuxer as public Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: export Dirac parsing API used by the ogg demuxer as publicAnton Khirnov2015-12-06
| | | | | | | | Also, stop using AVCodecContext for storing the stream parameters.
* | Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca': mpegenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegenc: use the CPB props side dataAnton Khirnov2015-12-06
| | | | | | | | | | Do not access the encoder options, since it makes no sense when the AVStream codec context is not the encoding context.
* | Merge commit '5845a8273e4694e0254ad728970b82bb64fd8bc0'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '5845a8273e4694e0254ad728970b82bb64fd8bc0': movenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: use the CPB props side dataAnton Khirnov2015-12-06
| | | | | | | | | | Do not access the encoder options, since it makes no sense when the AVStream codec context is not the encoding context.
* | Merge commit '825900248b4053515803152d3165efdb034b660b'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '825900248b4053515803152d3165efdb034b660b': qsvenc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: export CPB props side dataAnton Khirnov2015-12-06
| |
* | Merge commit '1520c6ff05d835da4b793318fc88bbbc129c86a1'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '1520c6ff05d835da4b793318fc88bbbc129c86a1': nvenc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * nvenc: export CPB props side dataAnton Khirnov2015-12-06
| |
* | Merge commit '2507b5dd674834be7261772996f47ae3b95cca69'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '2507b5dd674834be7261772996f47ae3b95cca69': mpegvideo_enc: export vbv_delay in side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo_enc: export vbv_delay in side dataAnton Khirnov2015-12-06
| | | | | | | | Deprecate AVCodecContext.vbv_delay
* | Merge commit '3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9': mpegvideo_enc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo_enc: export CPB props side dataAnton Khirnov2015-12-06
| |
* | Merge commit '732a37d1466d45b3812509d68c82e783530e291a'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '732a37d1466d45b3812509d68c82e783530e291a': libx264: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libx264: export CPB props side dataAnton Khirnov2015-12-06
| |
* | Merge commit '03afb62e83516141ba999536fc97575faefb98af'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '03afb62e83516141ba999536fc97575faefb98af': libvpxenc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libvpxenc: export CPB props side dataAnton Khirnov2015-12-06
| |
* | Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '11c9bd633f635f07a762be1ecd672de55daf4edc': libopenh264enc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libopenh264enc: export CPB props side dataAnton Khirnov2015-12-06
| |
* | Merge commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit 'f0b769c16daafa64720dcba7fa81a9f5255e1d29': lavc: add a packet side data type for VBV-like parameters Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: add a packet side data type for VBV-like parametersAnton Khirnov2015-12-06
| |
* | Merge commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit 'e63e3797a1ed9346f529848e6ba3d27fd2d2cc8d': avconv: pass the global codec side data to the muxer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: pass the global codec side data to the muxerAnton Khirnov2015-12-06
| |
* | Merge commit '84adab333cddeefc3cfd843089dee23f58bd372c'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '84adab333cddeefc3cfd843089dee23f58bd372c': lavc: add stream-global packet side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: add stream-global packet side dataAnton Khirnov2015-12-06
| | | | | | | | This is similar to what is done for AVStream.
* | Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '31c51f7441de07b88cfea2550245bf1f5140cb8f': avpacket: add a function for wrapping existing data as side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avpacket: add a function for wrapping existing data as side dataAnton Khirnov2015-12-06
| |
* | Merge commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | | | | | | | * commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48': h264: derive the delay from the level when it's not present Merged without changing the strict_std_compliance check, as it breaks FATE and changes decoding behavior. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: derive the delay from the level when it's not presentAnton Khirnov2015-12-06
| | | | | | | | | | | | | | | | | | | | | | Fall back to maximum DPB size if the level is unknown. This should be more spec-compliant and does not depend on the caller setting has_b_frames before opening the decoder. The old behaviour, when the delay is supplied by the caller setting has_b_frames, can still be obtained by setting strict_std_compliance below normal.
* | Merge commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '792b9c9dfcf44b657d7854368d975b5ca3bc22ca': h264: set frame_num in start_frame(), not decode_slice_header() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: set frame_num in start_frame(), not decode_slice_header()Anton Khirnov2015-12-06
| | | | | | | | | | That is a more appropriate place for it, since it is not allowed to change between slices.
* | Merge commit '741b494fa8cd28a7d096349bac183893c236e3f9'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '741b494fa8cd28a7d096349bac183893c236e3f9': h264: eliminate default_ref_list Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: eliminate default_ref_listAnton Khirnov2015-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | According to the spec, the reference list for a slice should be constructed by first generating an initial (what we now call "default") reference list and then optionally applying modifications to it. Our code has an optimization where the initial reference list is constructed for the first inter slice and then rebuilt for other slices if needed. This, however, adds complexity to the code, requires an extra 2.5kB array in the codec context and there is no reason to think that it has any positive effect on performance. Therefore, simplify the code by generating the reference list from scratch for each slice.
* | ffmpeg: add progress speed to status line and reportMoritz Barsnick2015-12-17
| | | | | | | | | | | | | | | | This adds a computation of the progress speed versus realtime ("Nx") to the status line and to the report log. It uses the progress time as already calculated for total output time as a base. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/swfenc: Check frama rate before writing itMichael Niedermayer2015-12-17
| | | | | | | | | | | | Fixes assertion failure with ffserver Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | diracdec: Fix codeblock parameters readingKieran Kunhya2015-12-16
| |
* | diracdec: Add support for HQ profileKieran Kunhya2015-12-16
| |
* | diracdec: Add 10-bits to pix_fmt tableKieran Kunhya2015-12-16
| |
* | opus_silk: fix typo causing overflow in silk_stabilize_lsfAndreas Cadhalpun2015-12-16
| | | | | | | | | | | | | | | | | | | | Due to this typo max_center can be too large, causing nlsf to be set to too large values, which in turn can cause nlsf[i - 1] + min_delta[i] to overflow to a negative value, which is not allowed for nlsf and can cause an out of bounds read in silk_lsf2lpc. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | ffprobe: use print_val to print the frame pkt_size valueStefano Sabatini2015-12-16
| | | | | | | | This allows to honour formatting options.
* | avfilter/af_sofalizer: use SIMD in compensate_volume()Paul B Mahol2015-12-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mips: add mips64r2 architecture variantVicente Olivert Riera2015-12-16
| | | | | | | | | | Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mips: i6400 core is not mips32r2, so disable mips32r2Vicente Olivert Riera2015-12-16
| | | | | | | | | | Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Allow specifying the program number for created programsMichael Niedermayer2015-12-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc: move exp2fi to ff_exp2fi in internal.hGanesh Ajjanagadde2015-12-16
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | lavu/eval: remove pow and exp2 for postfixesGanesh Ajjanagadde2015-12-16
| | | | | | | | | | | | | | | | | | | | These postfixes can be computed statically, and there is no need to waste runtime resources. Tested with FATE. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avfilter/vf_stereo3d: get rid of ts_unit hackPaul B Mahol2015-12-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/libopenh264: apply minor options text consistency fixesStefano Sabatini2015-12-16
| |
* | doc/encoders/libopenh264: update documentation after recent changesStefano Sabatini2015-12-16
| |