summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'Michael Niedermayer2015-07-2052-401/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534': Gather all coded_frame allocations and free functions to a single place Conflicts: libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/dvenc.c libavcodec/gif.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libopenjpegenc.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/v210enc.c libavcodec/v410enc.c libavcodec/xbmenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Gather all coded_frame allocations and free functions to a single placeVittorio Giovara2015-07-2049-419/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocating coded_frame is what most encoders do anyway, so it makes sense to always allocate and free it in a single place. Moreover a lot of encoders freed the frame with av_freep() instead of the correct API av_frame_free(). This bring uniformity to encoder behaviour and prevents applications from erroneusly accessing this field when not allocated. Additionally this helps isolating encoders that export information with coded_frame, and heavily simplifies its deprecation. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'Michael Niedermayer2015-07-201-1/+1
|\ \ | |/ | | | | | | | | | | * commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf': flashsvenc: Keep coded_frame.key_frame a write-only variable Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * flashsvenc: Keep coded_frame.key_frame a write-only variableVittorio Giovara2015-07-201-1/+1
| |
* | Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'Michael Niedermayer2015-07-200-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b': ffv1enc: Use input frame to set SAR and interlacing Conflicts: libavcodec/ffv1enc.c No change as the removed coded_frame uses where not in the code anymore Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * ffv1enc: Use input frame to set SAR and interlacingVittorio Giovara2015-07-201-4/+4
| |
* | Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'Michael Niedermayer2015-07-202-4/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e': ffv1enc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/ffv1.h libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * ffv1enc: Keep coded_frame.key_frame a write-only variableVittorio Giovara2015-07-202-5/+7
| |
* | Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'Michael Niedermayer2015-07-201-8/+14
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162': qtrleenc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/qtrleenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qtrleenc: Keep coded_frame.key_frame a write-only variableVittorio Giovara2015-07-201-8/+14
| |
* | Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'Michael Niedermayer2015-07-201-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f': libtheoraenc: Keep coded_frame.key_frame a write-only variable Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * libtheoraenc: Keep coded_frame.key_frame a write-only variableVittorio Giovara2015-07-201-1/+1
| |
* | Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'Michael Niedermayer2015-07-201-19/+19
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b': libvpxenc: Do not entangle coded_frame Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * libvpxenc: Do not entangle coded_frameVittorio Giovara2015-07-201-15/+15
| | | | | | | | Keep coded_frame.key_frame a write-only variable.
* | Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'Michael Niedermayer2015-07-201-9/+9
|\ \ | |/ | | | | | | | | | | * commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e': libxvid: Do not entangle coded_frame Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * libxvid: Do not entangle coded_frameVittorio Giovara2015-07-201-9/+9
| |
* | Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'Michael Niedermayer2015-07-202-15/+21
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919': svq1enc: Do not entangle coded_frame Conflicts: libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * svq1enc: Do not entangle coded_frameVittorio Giovara2015-07-202-15/+21
| |
* | Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'Michael Niedermayer2015-07-201-6/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024': proresenc: Do not entangle coded_frame Conflicts: libavcodec/proresenc_kostya.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * proresenc: Do not entangle coded_frameVittorio Giovara2015-07-201-7/+8
| |
* | Merge commit '91767360d86ac786571593ab11c7291010ab3829'Michael Niedermayer2015-07-201-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '91767360d86ac786571593ab11c7291010ab3829': a64multienc: Do not entangle coded_frame Conflicts: libavcodec/a64multienc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * a64multienc: Do not entangle coded_frameVittorio Giovara2015-07-201-6/+5
| | | | | | | | | | | | | | | | | | | | | | This change (and the following ones of the same kind) is mainly to simplify wrapping this section with an #if FF_API block later on. No functional changes are applied, the fields of the context coded_frame fields are directly initialized, instead of keeping a reference to the coded_frame itself. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'Michael Niedermayer2015-07-201-3/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e': roqvideoenc: Drop unneeded initialization Conflicts: libavcodec/roqvideoenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * roqvideoenc: Drop unneeded initializationVittorio Giovara2015-07-201-2/+0
| | | | | | | | Its fields are never initialized to begin with.
* | Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'Michael Niedermayer2015-07-201-2/+0
|\ \ | |/ | | | | | | | | | | * commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4': mpegvideo_enc: Drop unnneded initialization Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * mpegvideo_enc: Drop unnneded initializationVittorio Giovara2015-07-201-2/+0
| | | | | | | | coded_frame is already initialized where needed.
* | libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() callIvan Uskov2015-07-201-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: check for erf() and copysign()James Almer2015-07-201-0/+4
| | | | | | | | | | | | | | They are not available on some compilers. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/vf_ssim: add ff_ssim_4x4_line_xopJames Almer2015-07-202-3/+64
| | | | | | | | | | | | | | ~20% faster than ssse3. Also enabled for x86_32 Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/vf_ssim: fix some instruction commentsJames Almer2015-07-201-2/+2
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Adding myself as maintainer for qsv*Ivan Uskov2015-07-201-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/arm/intmath: return int for uint8 / uint16 clipMichael Niedermayer2015-07-201-4/+4
| | | | | | | | | | | | | | | | | | | | The C functions return uint8/16_t but that is effectively int not unsigned int Fixes fate-filter-tblend We do not return uint8/16_t as that would require the compiler to truncate the values, slowing it down. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: Implementation of AAC_fixed_decoder (SBR-module)Djordje Pesut2015-07-2015-190/+1237
| | | | | | | | | | | | | | Add fixed poind code. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: Table creation for AAC_fixed_decoder (SBR-module)Jovan Zelincevic2015-07-207-361/+469
| | | | | | | | | | | | | | Create tables for fixed point code. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: Template creation for AAC decoder (SBR-module)Djordje Pesut2015-07-205-1501/+1552
| | | | | | | | | | | | | | Move the existing code to a new template file. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | movtextdec.c: Correct the highlight tagsNiklesh2015-07-201-3/+3
| | | | | | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* | avcodec/apngdec: Fix typos in decoder causing incorrect resultsDonny Yang2015-07-201-5/+6
| | | | | | | | Signed-off-by: Donny Yang <work@kota.moe>
* | avcodec: loongson relocate constants of idctdsp and h264pred周晓勇2015-07-204-43/+36
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: loongson constants redefined with macros周晓勇2015-07-202-52/+52
| | | | | | | | | | Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_amerge: increase max number of channels from 32 to 64Paul B Mahol2015-07-201-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/af_astats: use UINT64_C instead of the LLU suffixJames Almer2015-07-201-1/+1
| | | | | | | | | | | | Should fix compilation with vs2012 Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'Michael Niedermayer2015-07-202-0/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2': parseutil: Add more resolution aliases Conflicts: doc/ffmpeg.texi libavutil/parseutils.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * parseutil: Add more resolution aliasesLuca Barbato2015-07-202-0/+12
| | | | | | | | Add DCI 2k and 4k and uhd1 and uhd2.
* | avformat/mp3dec: Rename sync() function to avoid build failure on androidMichael Niedermayer2015-07-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/avidec: Fix demuxing avi with broken indexMichael Niedermayer2015-07-201-2/+6
| | | | | | | | | | | | Fixes: genio-avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ffv1enc: fix assertion failure with unset bits per raw sampleMichael Niedermayer2015-07-201-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/jpeg2000: Signal lossless / bit-exact video stream.Carl Eugen Hoyos2015-07-201-0/+3
| |
* | lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.Carl Eugen Hoyos2015-07-201-0/+4
| |
* | lavc: Improve documentation for rc_max_rate and bit_rate.Carl Eugen Hoyos2015-07-201-2/+3
| | | | | | | | Both may be set by user (libavformat) on decoding.
* | avcodec/dds: Flip more R<->B casesMichael Niedermayer2015-07-201-5/+9
| | | | | | | | | | | | Fixes Ticket4665 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
View Lorry Controller Status