aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'Michael Niedermayer2015-01-273-23/+47
|\ | | | | | | | | | | | | | | | | | | | | * 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-273-22/+47
| |
* | Merge commit '728685f37ab333ca35980bd01766c78d197f784a'Michael Niedermayer2015-01-277-2/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-277-2/+44
| | | | | | | | | | 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-271-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-273-31/+33
| | | | | | | | | | 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-274-6/+9
|\| | | | | | | | | | | | | | | | | | | * 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-274-6/+9
| |
* | avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tagMichael Niedermayer2015-01-271-2/+3
| | | | | | | | | | | | 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-272-4/+9
|\| | | | | | | | | | | | | | | | | | | * 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-272-4/+9
| | | | | | | | Handle its only existing use case internally.
* | Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'Michael Niedermayer2015-01-273-47/+3
|\| | | | | | | | | | | | | | | | | | | * 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-273-44/+3
| | | | | | | | | | | | | | | | | | | | 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-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-271-0/+1
| |
* | Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'Michael Niedermayer2015-01-271-4/+0
|\| | | | | | | | | | | | | * 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-271-4/+0
| | | | | | | | | | They are always constructed anew when needed, so there is no need to reset them explicitly.
* | Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'Michael Niedermayer2015-01-273-24/+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-273-23/+26
| |
* | Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'Michael Niedermayer2015-01-276-18/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-276-16/+13
| | | | | | | | | | | | | | 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-270-0/+0
|\| | | | | | | | | | | | | | | * commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf': avconv_dxva2: add hevc support See: 5f2cdf9c3cc5e1159428999ec550a3979576c213 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv_dxva2: add hevc supportHendrik Leppkes2015-01-271-1/+9
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'Michael Niedermayer2015-01-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-275-1/+389
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'Michael Niedermayer2015-01-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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-272-32/+32
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'Michael Niedermayer2015-01-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba': hevc: add hwaccel hooks Conflicts: libavcodec/hevc.c libavcodec/hevc_refs.c See: b2e9b0f5d4dca93f54fba85f3345970a636e2b82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: add hwaccel hooksHendrik Leppkes2015-01-273-2/+56
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'Michael Niedermayer2015-01-270-0/+0
|\| | | | | | | | | | | | | | | * commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a': hevc: store the short term rps flag and size in the context See: 06894f1a04dda384ab3632b2342f0f97ec9ebed9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: store the short term rps flag and size in the contextHendrik Leppkes2015-01-272-3/+7
| | | | | | | | | | | | For future use by hardware accelerators. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '36779a84051eae6744cc936d91b1d428143665ba'Michael Niedermayer2015-01-270-0/+0
|\| | | | | | | | | | | | | | | * commit '36779a84051eae6744cc936d91b1d428143665ba': hevc: store the escaped/raw bitstream in HEVCNAL See: 2af82a1ad9f788ec3c1d22e15423996a4b161934 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: store the escaped/raw bitstream in HEVCNALHendrik Leppkes2015-01-272-2/+9
| | | | | | | | | | | | Hardware Accelerators require access to the escaped bitstream. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'Michael Niedermayer2015-01-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2': hevc: pass the full HEVCNAL struct to decode_nal_unit Conflicts: libavcodec/hevc.c See: 77140279d33006f1d949ee3717af67204dc519c6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: pass the full HEVCNAL struct to decode_nal_unitHendrik Leppkes2015-01-271-3/+3
| | | | | | | | | | | | | | This enables decode_nal_unit to access additional fields added in subsequent commits. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee'Michael Niedermayer2015-01-271-0/+13
|\| | | | | | | | | | | | | * commit '3a70c0c95feacb3844d05eebd579fc8189a77eee': examples/transcode_aac: generate proper PTS and set the muxer timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * examples/transcode_aac: generate proper PTS and set the muxer timebaseAndreas Unterweger2015-01-271-0/+13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'Michael Niedermayer2015-01-271-1/+1
|\| | | | | | | | | | | | | * commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e': examples/transcode_aac: fix a typo Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * examples/transcode_aac: fix a typoAndreas Unterweger2015-01-271-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761'Michael Niedermayer2015-01-271-7/+9
|\| | | | | | | | | | | | | * commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761': examples/transcode_aac: properly select the output sample format Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * examples/transcode_aac: properly select the output sample formatAndreas Unterweger2015-01-271-7/+9
| | | | | | | | | | | | Makes the example work with all the supported AAC encoders. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'Michael Niedermayer2015-01-271-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit '443b71928b2f36362e805c037751e6c3c79ea4e8': hevc: unref the current frame if frame_start() fails Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: unref the current frame if frame_start() failsAnton Khirnov2015-01-271-1/+1
| | | | | | | | Prevents DPB from filling up with damaged input.
* | Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'Michael Niedermayer2015-01-271-4/+5
|\| | | | | | | | | | | | | * commit '1dd021929f8157b88529ce1e6ab6351dd2899e89': hevc: clear unused refs on failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: clear unused refs on failureAnton Khirnov2015-01-271-4/+5
| |
* | Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'Michael Niedermayer2015-01-271-5/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'f9f883af4fe615a832407a657752e248a96c6280': h264: simplify code in flush_dpb() Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: simplify code in flush_dpb()Anton Khirnov2015-01-271-5/+1
| | | | | | | | | | There is no point in clearing reference explicitly, since that will be done as a part of ff_h264_unref_picture() right below.
* | ffmpeg_dxva2: add hevc supportHendrik Leppkes2015-01-271-1/+9
| | | | | | | | | | Reviewed-by: compn <tempn@mi.rr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add DXVA2 HEVC HWAccelHendrik Leppkes2015-01-275-1/+389
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: reindent after previous commitHendrik Leppkes2015-01-272-31/+31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 07:36:14 +0000