summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-28
| |
* | Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | * commit 'feeafb4adabd5c17de1738ed9962e40892b20edb': lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from ↵Anton Khirnov2013-10-28
| | | | | | | | shared objects
* | avcodec/audioconvert: deprecate APIMichael Niedermayer2013-10-29
| | | | | | | | | | | | | | | | Note, the header was not installed so useage of this should be limited but its not 0, there are some random pieces of code using it according to google. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cook: use av_freep()Paul B Mahol2013-10-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9a13a289d0e1607387854127476813a1ee3d34b': lavc: remove old unused audio conversion functions. Conflicts: libavcodec/audioconvert.c libavcodec/audioconvert.h Merge only for metadata. keeping the old API longer reduces the need for applications to be continuously updated. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove old unused audio conversion functions.Anton Khirnov2013-10-28
| |
* | avformat/gxf: fix old codec idMichael Niedermayer2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix old codec idsMichael Niedermayer2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvdec: dont try to decode ac when theres no inputMichael Niedermayer2013-10-28
| | | | | | | | | | | | fixes reading out of an empty bitstream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Factor out a couple of returnsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Simplify a stray av_log messageStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Use AV_* prefixes for video and audio IDsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove outdated undef blockStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove a couple of useless AviSynthContext castsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Don't declare structs anonymouslyStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: CosmeticsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Change most of the comments to /* */ from //Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Introduce USING_AVISYNTH macroStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: demux synchronous SMPTE 336M Key-Length-Value (KLV) metadataPeter Ross2013-10-28
| | | | | | | | Fixes ticket #2579.
* | avutil/opt: check flags validity in write_number()Michael Niedermayer2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263dec: fix handling of AV_EF_EXPLODEMichael Niedermayer2013-10-28
| | | | | | | | | | | | This fixes checking a variable that had been overwritten before. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix outptr increment. Conflicts: libavcodec/ac3dec.c No change as this has been fixed in ffmpeg head already Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3dec: fix outptr increment.Michael Niedermayer2013-10-28
| | | | | | | | | | | | | | | | | | Fixes corrupt data errors when downmixing in the AC-3 decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org
* | Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | * commit 'a1c5cc429d99216406170eac7e8352860076d3e8': lavc: don't set AVFrame.pts to random numbers in decoders. Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: don't set AVFrame.pts to random numbers in decoders.Anton Khirnov2013-10-28
| |
* | Merge commit '2ba68dd044ca8fc591139c05563840f546a9c0c0'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ba68dd044ca8fc591139c05563840f546a9c0c0': lavf: remove unreliable timestamp guessing heuristic Conflicts: libavformat/utils.c Not merged, as the change breaks ABI by removing a field from the middle of AVStream. Also, if you have files that decode better or worse without this code please open a ticket on trac. If the timestamp code turns out useless it of course should be removed. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove unreliable timestamp guessing heuristicAnton Khirnov2013-10-28
| |
* | Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | * commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc': g722dec: Change bits_per_codeword to the right option type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g722dec: Change bits_per_codeword to the right option typeMartin Storsjö2013-10-28
| | | | | | | | | | | | | | This isn't a set of flags but just a plain integer in the range 6-8. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | * commit '884c7a6eb86a9bc05abafc058b279018ded7de5f': avfilter: fix const use of avfilter_next See: d94c90700863ce3c0bb87e8e590396b919880a6f See: e4723a82f7088f5d4ab32ada529c3f69ba3606b0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter: fix const use of avfilter_nextVittorio Giovara2013-10-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | * commit '5c439b41d0489412c0a4cf6dfb98915251677b8e': avfilter: have avfilter_get_by_name return const for next bump Conflicts: libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter: have avfilter_get_by_name return const for next bumpVittorio Giovara2013-10-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | * commit '97de206b44a48da726807cc3e7b9448a8112760b': lavc: disable CRC checking by default Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: disable CRC checking by defaultAnton Khirnov2013-10-28
| |
* | Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '23a211cbba0b7c9ee694040031b2e5da1be54a00': lavc: change all decoders to behave consistently with AV_EF_CRCCHECK. Conflicts: libavcodec/avcodec.h libavcodec/tta.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.Anton Khirnov2013-10-28
| | | | | | | | | | | | Just crccheck prints a warning, crccheck+explode returns an error. Also document this behavior.
* | Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f354f30836a3148275ce60d19bbc581310249ad2': error resilience: check error_concealment, not err_recognition. Conflicts: libavcodec/error_resilience.c See: 346e09638cc159a3c3e4cf971a5b795644faac16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error resilience: check error_concealment, not err_recognition.Anton Khirnov2013-10-28
| | | | | | | | | | err_recognition is supposed to trigger detecting and reporting errors, not trying to fix them.
* | Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | * commit '53151723e377b9c43f876e20d7f27a17993256c8': avio: K&R formatting cosmetics Conflicts: libavformat/avio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: K&R formatting cosmeticsLuca Barbato2013-10-28
| |
* | Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | | | * commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185': h263: Check init_get_bits return value Conflicts: libavcodec/h263dec.c See: d47e14b53a3908e5bad82e22129bbd175b49e89b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Check init_get_bits return valueMichael Niedermayer2013-10-28
| | | | | | | | | | | | | | And use init_get_bits8 to check for integer overflows while at it. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '0749314886390f6ec81d45e0ba424fcb36c945cf': h263: Return meaningful errors Conflicts: libavcodec/h263dec.c See: 7b62d3415e8e44618cb97775567d453295c4f4d9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Return meaningful errorsLuca Barbato2013-10-28
| |
* | Merge commit 'de6061203e2d509579ab110fb1873aade34320f5'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | * commit 'de6061203e2d509579ab110fb1873aade34320f5': configure: Disable -Wmaybe-uninitialized by default Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 17:35:54 +0000