summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * configure: Don't force _WIN32_WINNT to an older version if targeting ↵Martin Storsjö2015-07-281-1/+12
| | | | | | | | | | | | | | | | | | | | | | winphone/winrt This avoids having to manually set _WIN32_WINNT in --extra-cflags when targeting these API families, which only was necessary to work around configure setting _WIN32_WINNT to an older version by default. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd75b55635a02444c2f188c26e431a1cec992babe'Michael Niedermayer2015-07-283-5/+5
|\ \ | |/ | | | | | | | | | | * commit 'd75b55635a02444c2f188c26e431a1cec992babe': dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600Martin Storsjö2015-07-283-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If _WIN32_WINNT is unset, we force it to a new enough value to make sure the necessary definitions are visible. When targeting Windows Phone or Windows RT, _WIN32_WINNT should be at least 0x0602 - otherwise the windows headers themselves can cause errors (which technically are bugs in the headers). Raising this value here shouldn't hurt; the alternative would be to not touch it at all if WINAPI_FAMILY is set to phone/app, or to force setting it to 0x0602 in configure if unset (for phone/app). Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 ↵Ivan Uskov2015-07-281-1/+1
| | | | | | | | | | | | microseconds Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvenc.c delay in 1 microsecond replaced to more appropriate 500 ↵Ivan Uskov2015-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | microseconds This commit replaces the 1 microsecond delay by 500 microsecond for the case when the MFX library does return MFX_WRN_DEVICE_BUSY status. In general this warning never appears for simple encoding or transcoding session because the GPU is so fast so it almost always is not busy and any delay value just does not executes. But for heavy transcoding tasks for example, when several QSV sessions are running simultaneously then using a 1-microsecond delay may result in 1000 iterations per each frame. So here possible a paradoxical case when GPU loading also loads CPU by dummy tasks. Official MFX/QSV samples by Intel are using 1 millisecond (i.e. 1000 microseconds) everywhere where MFX_WRN_DEVICE_BUSY does appear. So 500us is a much more optimal value than 1us. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aac_fixed: Fix a bug in spectral_to_sample()Nedeljko Babic2015-07-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was fixed number of loops (2048) in preparation for resampler, so when number of samples is smaller than this, there would be an overflow on ret_buf. For some reason this behavior popped out only under valgrind with --disable-memory-poisoning option. This is now fixed and number of loops depends on actual number of samples. Signed-off-by: Nedeljko Babic <nedeljko.babic@rt-rk.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg.c: remove all remaining coded_frame usesMichael Niedermayer2015-07-282-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/hevc_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to ↵Ivan Uskov2015-07-281-7/+33
| | | | | | | | | | | | avoid extradata modification. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/libdcadec: exss is used only under ifdef, thus mark it as ↵Michael Niedermayer2015-07-281-1/+1
| | | | | | | | | | | | | | | | potentially unused avoids a compiler warning Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_slice: Also check sei_recovery_frame_cnt for skip_frame nokeyMichael Niedermayer2015-07-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_slice: do not skip 2nd field if first was not skippedMichael Niedermayer2015-07-281-8/+10
| | | | | | | | | | Found-by: John Högberg <john.hogberg@ericsson.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avdevice/decklink: Fix build error caused by a change in the SDK.Chris Spencer2015-07-281-0/+6
| | | | | | | | | | | | | | In version 10.4 of the DeckLink SDK, GetBufferedAudioSampleFrameCount() was changed to take an unsigned int instead of an unsigned long. Signed-off-by: Chris Spencer <spencercw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Use side data instead of coded_frame for error[] valuesMichael Niedermayer2015-07-282-3/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/snowenc: Export quality/pict_type/PSNR stats through side dataMichael Niedermayer2015-07-281-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo_enc: export per frame PSNR through side dataMichael Niedermayer2015-07-281-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avocdec/mpeg12dec: fix mpeg_xvmc hwaccel flagJames Almer2015-07-271-1/+1
| | | | | | | | | | | | The flag is deprecated and as such didn't get a new AV_ prefixed version Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/mpegvideo_enc: move ff_side_data_set_encoder_stats() call to after ↵Michael Niedermayer2015-07-281-2/+2
| | | | | | | | | | | | | | | | the vbv retry code This ensures the data matches the final values Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'Michael Niedermayer2015-07-280-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b7040e67ec18259ca634a0e29d98469b3484a87c': h264: fix AVDISCARD_NONKEY for some interlaced content Conflicts: libavcodec/h264.c Not merged, the used field is not initialized where it is used Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * h264: fix AVDISCARD_NONKEY for some interlaced contentJohn Högberg2015-07-271-1/+1
| | | | | | | | | | | | | | | | | | When skip_frame is set to _NONKEY the decoder skips everything except intra slices, which breaks frames that consist of an intra field together with any other field type; half the frame becomes garbage. This patch fixes the issue by letting non-intra slices through if they're part of a keyframe. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'Michael Niedermayer2015-07-281-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf': asfdec: do not align Data Object when Broadcast Flag is set Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: do not align Data Object when Broadcast Flag is setAlexandra Hájková2015-07-271-2/+2
| | | | | | | | | | | | its size is invalid in this case Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'Michael Niedermayer2015-07-280-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'db21dde3f72c2331653399bdb8745350f015d847': qsvdec_mpeg2: drop an incorrect comment Conflicts: libavcodec/qsvdec_mpeg2.c No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvdec_mpeg2: drop an incorrect commentAnton Khirnov2015-07-271-1/+0
| | | | | | | | It got copypasted from the h264 decoder, but it does not apply to mpeg2.
* | Merge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'Michael Niedermayer2015-07-280-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead': fate: Add hap-chunk ref file Conflicts: tests/ref/fate/hap-chunk See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * fate: Add hap-chunk ref fileVittorio Giovara2015-07-271-0/+2
| | | | | | | | Missing from the push of 3ee217853a6741b829a2683f49c590618891b1ab.
* | Merge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'Michael Niedermayer2015-07-280-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7': hap: Add utility functions file Conflicts: libavcodec/hap.c No change, no files are/where missing in FFmpeg Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * hap: Add utility functions fileVittorio Giovara2015-07-271-0/+55
| | | | | | | | Missing from the push of 3ee217853a6741b829a2683f49c590618891b1ab.
* | Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'Michael Niedermayer2015-07-273-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '3ee217853a6741b829a2683f49c590618891b1ab': Support the Hap chunked frame format Conflicts: libavcodec/hap.h libavcodec/hapdec.c libavcodec/version.h See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Support the Hap chunked frame formatTom Butterworth2015-07-276-97/+414
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '43dd004747fa697396b47d034a80e069facbea09'Michael Niedermayer2015-07-271-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '43dd004747fa697396b47d034a80e069facbea09': hap: Move some per-stream setup into decoder init rather than per-frame Conflicts: libavcodec/hapdec.c See: 6074956fa1d2617ac602e49931b06df0a751370e Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * hap: Move some per-stream setup into decoder init rather than per-frameTom Butterworth2015-07-271-21/+28
| | | | | | | | | | | | | | This change will reject frames with a texture type which does not match the stream description. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'b94ec30428b9696f99b08055735689623fe63954'Michael Niedermayer2015-07-273-2/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b94ec30428b9696f99b08055735689623fe63954': lavc: Update version and APIchanges Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Update version and APIchangesVittorio Giovara2015-07-273-2/+15
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-27153-287/+296
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-27150-264/+273
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27334-502/+613
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-27276-393/+487
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27131-446/+563
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-27107-353/+450
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avfilter: add acrossfade filterPaul B Mahol2015-07-266-57/+462
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'Michael Niedermayer2015-07-2713-107/+214
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6': lavc: Deprecate avctx.me_method Conflicts: doc/encoders.texi libavcodec/avcodec.h libavcodec/libx264.c libavcodec/motion_est.c libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Deprecate avctx.me_methodVittorio Giovara2015-07-2714-111/+221
| | | | | | | | | | | | | | | | This option is extremely codec specific and only a few codecs employ it. Move it to codec private options instead: mpegenc family supports only 3 values, xavs and x264 use 5, and xvid has a different metric entirely. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'Michael Niedermayer2015-07-271-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '03eb55741427c6608f63972c105e565ca0ba4f15': wmv2enc: Check memory allocation Conflicts: libavcodec/wmv2enc.c See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * wmv2enc: Check memory allocationVittorio Giovara2015-07-271-0/+3
| |
* | Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'Michael Niedermayer2015-07-270-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09': ac3enc_template: Use the correct context field See: 320ce9f284171f8c8d8561cccd2186c27f24898c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * ac3enc_template: Use the correct context fieldVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | For audio encoders, delay has no effect, use the appropriate one, initial_padding (see 2df0c32).
* | avcodec/v410enc: do not use internal->byte_bufferMichael Niedermayer2015-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | it is not optimal when the buffer size is well known at allocation time This avoids a memcpy() about 1% faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: do not use internal->byte_buffer when little downsizing is ↵Michael Niedermayer2015-07-271-1/+1
| | | | | | | | | | | | expected Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()Michael Niedermayer2015-07-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Add a min size parameter to ff_alloc_packet2()Michael Niedermayer2015-07-2789-92/+96
| | | | | | | | | | | | | | | | This parameter can be used to inform the allocation code about how much downsizing might occur, and can be used to optimize how to allocate the packet Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
OpenPOWER on IntegriCloud