summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo.h
Commit message (Collapse)AuthorAge
* Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'Michael Niedermayer2015-01-07
|\ | | | | | | | | | | | | * commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1': msmpeg4: check memory allocations and propagate errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * msmpeg4: check memory allocations and propagate errorsVittorio Giovara2015-01-06
| | | | | | | | Bug-Id: CID 1257781
* | Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'Michael Niedermayer2014-12-15
|\| | | | | | | | | | | | | * commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1': mpegvideo: move REBASE_PICTURE where it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move REBASE_PICTURE where it is usedVittorio Giovara2014-12-15
| | | | | | | | Drop an unused #undef from h264 decoder.
* | Merge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'Michael Niedermayer2014-12-15
|\| | | | | | | | | | | | | * commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8': mpegvideo: remove unused function declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove unused function declarationVittorio Giovara2014-12-15
| |
| * mpegvideo: fix size of arrayVittorio Giovara2014-11-11
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238789
* | Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'Michael Niedermayer2014-11-11
|\| | | | | | | | | | | | | | | * commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba': mpeg12enc: increase declared size of block function argument See: 2cf514354bbeebb2334d00ab54c3fcb8ae2ee678 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12enc: increase declared size of block function argumentMichael Niedermayer2014-11-11
| | | | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1047236 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/snowenc: add FF_MPV_COMMON_OPTSMichael Niedermayer2014-10-18
| | | | | | | | | | | | | | | | This fixes the ratecontrol code with snow adding FF_MPV_COMMON_OPTS is needed as the generic rate control options are currently in the (unrelated) MpegEncContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45': lavc: make lmax/lmin into private options of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make lmax/lmin into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40': lavc: make border_masking into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make border_masking into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6': lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of ↵Anton Khirnov2014-10-18
| | | | | | | | mpegvideo encoders
* | Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'a75c2eb25a62105c09b48521aef429dc8a231637': lavc: make rc_eq into private options of mpegvideo encoders Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_eq into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '946f95354ba76ef73c9b66889d86ab5fba4fb486': lavc: make rc_qmod_* into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_qmod_* into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf': lavc: make rc_qsquish a private option of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_qsquish a private option of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | avcodec/mpegvideo: Factor ff_mpv_decode_init() outMichael Niedermayer2014-09-05
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun2014-08-15
| |
* | Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '998c9f15d1ca8c7489775ebcca51623b915988f1': idct: remove call to ff_idctdsp_init from ff_MPV_common_init Conflicts: libavcodec/dnxhdenc.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * idct: remove call to ff_idctdsp_init from ff_MPV_common_initJohn Stebbins2014-08-14
| | | | | | | | | | One step in untangling the mpegvideo code and fixing some problems in the order that initialization is being done in h263dec and h261dec.
* | Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | * commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e': mpegvideo: move vol_control_parameters to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move vol_control_parameters to the only place it is usedNidhi Makhijani2014-07-29
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'Michael Niedermayer2014-07-26
|\| | | | | | | | | | | | | | | | | | | * commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3': mpegvideo: Move QMAT_SHIFT* defines to the only place they are used Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move QMAT_SHIFT* defines to the only place they are usedDiego Biurrun2014-07-25
| |
* | Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'Michael Niedermayer2014-07-26
|\| | | | | | | | | | | | | * commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8': mpegvideo: Move ME_MAP_* defines to the only place they are used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move ME_MAP_* defines to the only place they are usedDiego Biurrun2014-07-25
| |
* | Merge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'Michael Niedermayer2014-07-26
|\| | | | | | | | | | | | | | | | | | | * commit 'ff85334375c6733c6116ea3686f128b4a11f33e7': mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines CHROMA_444 is not removed as we do support CHROMA_444 and use the identifier Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 definesDiego Biurrun2014-07-25
| |
* | Merge commit '436ced244fadcde2c0b925627920e84b25482542'Michael Niedermayer2014-07-24
|\| | | | | | | | | | | | | * commit '436ced244fadcde2c0b925627920e84b25482542': mpegenccontext: Remove unused opaque pointer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegenccontext: Remove unused opaque pointerNidhi Makhijani2014-07-24
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'Michael Niedermayer2014-07-23
|\| | | | | | | | | | | | | * commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7': mpegenccontext: Remove unused dct_unquantize_h261 function pointers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegenccontext: Remove unused dct_unquantize_h261 function pointersNidhi Makhijani2014-07-23
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'Michael Niedermayer2014-07-23
|\| | | | | | | | | | | | | * commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb': mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is usedDiego Biurrun2014-07-23
| |
* | Merge commit '16e6652286213014c28a9c3af70435e767d28638'Michael Niedermayer2014-07-22
|\| | | | | | | | | | | | | | | | | | | * commit '16e6652286213014c28a9c3af70435e767d28638': aarch64: NEON intrinsics dct_unquantize_h263. Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON intrinsics dct_unquantize_h263.James Yu2014-07-21
| | | | | | | | | | | | | | | | | | Intrinsics only used on aarch64 since the existing ARMv7 NEON asm is slightly faster (Cortex-A9, gcc-4.8, micro-benchmarks and full decoding time). Signed-off-by: James Yu <james.yu@linaro.org> Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'Michael Niedermayer2014-07-20
|\| | | | | | | | | | | | | * commit '9f99a5f1d078721a30a76aec27c58805b7b87e58': mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegencconetxt: Move rv10-specific orig_width/orig_height where they belongNidhi Makhijani2014-07-20
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun2014-07-17
| |
* | Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'Michael Niedermayer2014-07-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e': dsputil: Split off pixel block routines into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/pixblockdsp_template.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off pixel block routines into their own contextDiego Biurrun2014-07-09
| |
* | Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'Michael Niedermayer2014-07-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3': dsputil: Split off FDCT bits into their own context Conflicts: configure libavcodec/Makefile libavcodec/asvenc.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>