summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avfilter/vf_telecine: use the name 's' for the pointer to the private contextPaul B Mahol2015-01-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avutil/aes: Rename crypt()Michael Niedermayer2015-01-28
| | | | | | | This avoids a potential conflict with the equally named function from XOPEN It also could reduce confusion in debugger backtraces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/h264_parser: Rename close()Michael Niedermayer2015-01-28
| | | | | | | This avoids a potential conflict with the equally named function for closing files It also could reduce confusion in debugger backtraces Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/fftools-common-opts: update/extend documentation for -opencl_bench optionManeesh Gupta2015-01-28
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* avcodec/nvenc: Handle non-square pixel aspect ratiosTimo Rothenpieler2015-01-28
| | | | | Reviewed-by: Philip Langdale <philipl@overt.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* tests/fate: added mxf tests for essencegroups and missing indexMark Reid2015-01-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mxfdec: Fix cleanup in mxf_free_metadataset()Carl Eugen Hoyos2015-01-28
| | | | | | | Fixes Ticket4256 Found-by: tholin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacketMichael Niedermayer2015-01-28
| | | | | | This is also simpler Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample_internal.h: Move struct declaration before first use.Reimar Döffinger2015-01-27
| | | | | | | It seems more logical and works with more restricted C compilers like tinycc. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Support BMP files that do not properly align lines.Reimar Döffinger2015-01-27
| | | | | | | | | Quite a few programs missed that detail of the spec (including old versions of FFmpeg I believe) and when we would otherwise fail anyway it seems worth a try to use a simple byte-aligned stride instead. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge commit '8805589b803fab5f362008306319336ac79a3fa7'Michael Niedermayer2015-01-27
|\ | | | | | | | | | | | | * commit '8805589b803fab5f362008306319336ac79a3fa7': libopencv: Rework error handling in parse_iplconvkernel() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencv: Rework error handling in parse_iplconvkernel()Vittorio Giovara2015-01-27
| | | | | | | | | | | | | | Fix 'values' memory leak in case of error. CC: libav-stable@libav.org Bug-Id: CID 739879
* | Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit '607ad990d31e6be52980970e5ce8cd25ab3de812': dvbsubdec: check memory allocations and propagate errors Conflicts: libavcodec/dvbsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dvbsubdec: check memory allocations and propagate errorsVittorio Giovara2015-01-27
| |
* | Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | * commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52': nuv: validate image size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nuv: validate image sizeVittorio Giovara2015-01-27
| | | | | | | | | | | | | | Avoid a division by zero. CC: libav-stable@libav.org Bug-Id: CID 717750
* | Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | * commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6': nsvdec: validate channels and samplerate See: d633e15d7d939f532326e2bc92097b12eba4d5ae Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nsvdec: validate channels and samplerateVittorio Giovara2015-01-27
| | | | | | | | | | | | | | Avoid a division by zero. CC: libav-stable@libav.org Bug-Id: CID 717749
* | Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | * commit 'a536a4e4bc52d05f59869761337452fb1f1977f6': lavc: support extracting audio service type from side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: support extracting audio service type from side dataAnton Khirnov2015-01-27
| |
* | Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | * commit '32125781487411ed3b1b28b32063d6cd4024d4fc': mov: export audio service type as side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: export audio service type as side dataAnton Khirnov2015-01-27
| |
* | Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '4227e4fe7443733fb906f6fb6c265105e8269c74': lavf: add a convenience function for adding side data to a stream Conflicts: libavformat/internal.h libavformat/replaygain.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add a convenience function for adding side data to a streamAnton Khirnov2015-01-27
| |
* | Merge commit '728685f37ab333ca35980bd01766c78d197f784a'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '728685f37ab333ca35980bd01766c78d197f784a': Add a side data type for audio service type. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add a side data type for audio service type.Anton Khirnov2015-01-27
| | | | | | | | | | Currently, audio service type is a field in AVCodecContext. However, side data is more appropriate for this kind of information.
* | Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80a11de7dca315505bf203ce9c8c016e71724fd2': nutenc: do not use has_b_frames Conflicts: libavformat/nutenc.c tests/ref/lavf/nut tests/ref/seek/lavf-nut Mostly not merged, this is simply not correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: do not use has_b_framesAnton Khirnov2015-01-27
| | | | | | | | | | It is unreliable, especially when the stream codec context is not the encoding context. Use the codec descriptor properties instead.
* | Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9': lavc: deprecate unused AVCodecContext.stream_codec_tag Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused AVCodecContext.stream_codec_tagAnton Khirnov2015-01-27
| |
* | avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tagMichael Niedermayer2015-01-27
| | | | | | | | | | | | If this causes problems then the stream_codec_tag should be enabled again Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit 'f771b3ab5d3c0b763ee356152be550f4121babd0': avidec: do not export stream_codec_tag Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: do not export stream_codec_tagAnton Khirnov2015-01-27
| | | | | | | | Handle its only existing use case internally.
* | Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6': h264: drop any pretense of support for data partitioning Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop any pretense of support for data partitioningAnton Khirnov2015-01-27
| | | | | | | | | | | | | | | | | | | | It does not work correctly and apparently never did. There is no indication that this (mis)feature is ever used in the wild or even that any software other than the reference supports it. Since the code that attempts to support it adds some nontrivial complexity and has resulted in several bugs in the past, it is better to just drop it.
* | Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '58ae8d595724150c407ca2c2df3aa4bd5580397c': h264_parser: restore a comment lost in 0268a54 Conflicts: libavcodec/h264_parser.c No change, the code that is commented is no longer there in the form to which the comment applied Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_parser: restore a comment lost in 0268a54Anton Khirnov2015-01-27
| |
* | Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | * commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8': h264: do not reset the ref lists in flush_change() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not reset the ref lists in flush_change()Anton Khirnov2015-01-27
| | | | | | | | | | They are always constructed anew when needed, so there is no need to reset them explicitly.
* | Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | * commit '9404a47a2d1df418946a338938eb6cdb3afed474': h264: move parser-only variables to their own context Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move parser-only variables to their own contextAnton Khirnov2015-01-27
| |
* | Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094': error_resilience: move the MECmpContext initialization into ER code Conflicts: libavcodec/error_resilience.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: move the MECmpContext initialization into ER codeAnton Khirnov2015-01-27
| | | | | | | | | | | | | | Currently, it needs to be initialized by the ER caller (which is currently either a mpegvideo decoder or h264dec). However, since none of those decoders use MECmpContext for anything except ER, it makes more sense to handle it purely inside ER.
* | Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | * commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf': avconv_dxva2: add hevc support See: 5f2cdf9c3cc5e1159428999ec550a3979576c213 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv_dxva2: add hevc supportHendrik Leppkes2015-01-27
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116': Add DXVA2 HEVC HWAccel Conflicts: configure libavcodec/allcodecs.c libavcodec/dxva2_hevc.c See: 36962ad2339d003f327336afd6d00ad3a5a58816 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add DXVA2 HEVC HWAccelHendrik Leppkes2015-01-27
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b82722df9b2911bd41e0928db4804067b39e6528': hevc: reindent after previous commit Conflicts: libavcodec/hevc.c See: f8ecffa9b7e49860ce030fb3cabb60b3143384db Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: reindent after previous commitHendrik Leppkes2015-01-27
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'Michael Niedermayer2015-01-27
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba': hevc: add hwaccel hooks Conflicts: libavcodec/hevc.c libavcodec/hevc_refs.c See: b2e9b0f5d4dca93f54fba85f3345970a636e2b82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 03:57:09 +0000