summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo.c
Commit message (Collapse)AuthorAge
* Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17'Hendrik Leppkes2015-09-07
|\ | | | | | | | | | | | | * commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17': mpegvideo: Drop a stray error message Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo: Drop a stray error messageLuca Barbato2015-09-03
| | | | | | | | The condition is not a failure.
* | lavc: put remaining bits of vdpau-in-decoder under FF_API_CAP_VDPAU.Ronald S. Bultje2015-08-18
| |
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-27
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-27
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/mpegvideo: Fix null pointer dereference of picture arrayMichael Niedermayer2015-07-14
| | | | | | | | | | | | | | Fixes: 0d0a2bace067d09c08f0fa5340496c23_signal_sigsegv_7ffff713351a_342_WobblyWindowsIntro.avi with memlimit of 67108864 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo: Check for NULL in ff_mpv_common_end()Michael Niedermayer2015-07-13
| | | | | | | | | | | | | | Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 1048576 alloc limit Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo: Clear pointers in ff_mpv_common_init()Michael Niedermayer2015-07-09
| | | | | | | | | | | | | | | | | | This ensures that no stale pointers leak through on any path Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functionsShivraj Patil2015-07-01
| | | | | | | | | | | | | | This patch adds MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions in new file mpegvideo_msa.c Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'Michael Niedermayer2015-06-12
|\| | | | | | | | | | | | | | | | | | | * commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25': mpegvideo: Move ER functions to a separate file Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move ER functions to a separate fileVittorio Giovara2015-06-12
| |
* | Merge commit 'c0e6b8cab874db97b6818007bc86507c8d213083'Michael Niedermayer2015-06-10
|\| | | | | | | | | | | | | * commit 'c0e6b8cab874db97b6818007bc86507c8d213083': mpegvideo: Mark one function as static Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Mark one function as staticVittorio Giovara2015-06-10
| |
* | Merge commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88'Michael Niedermayer2015-06-10
|\| | | | | | | | | | | | | * commit 'd1dd0d404c085f4fce7b8358b4aea677761c5d88': mpegvideo: Move block permutation function where is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move block permutation function where is usedVittorio Giovara2015-06-10
| | | | | | | | Mark it as static.
* | Merge commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'Michael Niedermayer2015-06-10
|\| | | | | | | | | | | | | | | | | | | * commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381': mpegvideo: Drop release_unused_pictures() function Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop release_unused_pictures() functionVittorio Giovara2015-06-10
| | | | | | | | | | It is only used in one place, and it is small enough that it might be called directly.
* | Merge commit '7061bf0925a7d6c5899bbe710b2b8cdae9005274'Michael Niedermayer2015-06-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '7061bf0925a7d6c5899bbe710b2b8cdae9005274': mpegvideo: Move Picture-related functions to a separate file Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move Picture-related functions to a separate fileVittorio Giovara2015-06-10
| |
* | Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'Michael Niedermayer2015-06-08
|\| | | | | | | | | | | | | | | | | | | * commit '9bb11be0e5a75782c3139ad058c2b571499aa37d': mpegvideo: Split picture allocation for encoding and decoding Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Split picture allocation for encoding and decodingVittorio Giovara2015-06-08
| | | | | | | | | | | | | | | | | | The main ff_alloc_picture() function is made more generic with all the parameters necessary as arguments. This will allows to move most of the related functions to a separate file later. Right now wrappers are provided to try and minimize the number of changes in the code.
* | Merge commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a'Michael Niedermayer2015-06-08
|\| | | | | | | | | | | | | | | | | | | * commit 'f8716a1408f4f4ec63857b7015fbd62f9eac344a': mpegvideo: Rework frame_size_alloc function Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Rework frame_size_alloc functionVittorio Giovara2015-06-08
| | | | | | | | | | Use more generic arguments and remove its static attribute since it will be moved to a separate file.
* | Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'Michael Niedermayer2015-06-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da0c8664b4dc906696803685f7e53ade68594ab8': mpegvideo: Move various temporary buffers to a separate context Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/vc1_mc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move various temporary buffers to a separate contextVittorio Giovara2015-06-08
| |
* | avcodec/mpegvideo: Use av_memdup() for allocating thread_contextMichael Niedermayer2015-06-06
| | | | | | | | | | | | Also check for allocation failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Clear thread_context array before allocatingMichael Niedermayer2015-06-06
| | | | | | | | | | | | This is probably redundant but its safer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Merge thread context initialization loopsMichael Niedermayer2015-06-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: use av_clip() instead of nested min & maxClément Bœsch2015-06-06
| | | | | | | | | | Note: MpegEncContext.mb_{y,height} are int fields, as well as local off variable.
* | Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | * commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61': mpegvideo: Move tables to a separate file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move tables to a separate fileVittorio Giovara2015-05-31
| |
* | Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | * commit '2f15846ad7ad57beb0bca99c624affa0facf284b': mpegvideo: wmv2: Move function declarations Conflicts: libavcodec/wmv2.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: wmv2: Move function declarationsVittorio Giovara2015-05-31
| |
* | avcodec/mpegvideo: Use FFSWAP to exchange pointersMichael Niedermayer2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Reset bitstream_buffer_size on allocation failureMichael Niedermayer2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Check pointer when allocation failRoman Savchenko2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | | | | | * commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d': mpegvideo: Move ff_*_rl functions to a separate file Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move ff_*_rl functions to a separate fileAnton Khirnov2015-05-28
| |
* | Merge commit '419e3404d07acaac019e8f363c281e17c3a3d622'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | * commit '419e3404d07acaac019e8f363c281e17c3a3d622': mpegvideo: Drop exchange_uv() function and use its code directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop exchange_uv() function and use its code directlyVittorio Giovara2015-05-28
| | | | | | | | Code is small enough that there is no advantage in a separate function.
* | Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | * commit '4e17946f10d39eec6cc03fb249ae8147373141b6': mpegvideo: Rework various functions not to use MpegEncContext directly Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Rework various functions not to use MpegEncContext directlyVittorio Giovara2015-05-22
| |
* | Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | * commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2': mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directlyVittorio Giovara2015-05-22
| |
* | Merge commit 'd528045558825f01472e9bee873f60c98d661e53'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd528045558825f01472e9bee873f60c98d661e53': mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c The memset is left in place Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directlyVittorio Giovara2015-05-22
| | | | | | | | | | This skips setting the memory to 0 but allows for reuse on different contextes. Oracle did not report any unsual activity because of it.
* | Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c1db92ad372d4cd69e0490e691c56e4097cb193': mpegvideo: Drop err_recognition Conflicts: libavcodec/h263dec.c libavcodec/ituh263dec.c libavcodec/mpeg4video.h libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 04:52:14 +0000