summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo.h
Commit message (Collapse)AuthorAge
* 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>
| * dsputil: Split off FDCT bits into their own contextDiego Biurrun2014-07-07
| |
* | Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'Michael Niedermayer2014-07-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b': dsputil: Move draw_edges() to mpegvideoencdsp Conflicts: libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move draw_edges() to mpegvideoencdspDiego Biurrun2014-07-06
| |
* | Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'Michael Niedermayer2014-07-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94': dsputil: Split off *_8x8basis to a separate context Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off *_8x8basis to a separate contextDiego Biurrun2014-07-06
| |
* | Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-30
| |
* | Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28': mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Change ff_convert_matrix() to take an MpegEncContext parameterDiego Biurrun2014-06-27
| | | | | | | | This will come in handy during dsputil splitting.
* | Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'Michael Niedermayer2014-06-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf': dsputil: Split off global motion compensation bits into a separate context Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/ppc/dsputil_altivec.h libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off global motion compensation bits into a separate contextDiego Biurrun2014-06-23
| |
* | Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'Michael Niedermayer2014-06-23
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7b9ef8d701c319c26f7d0664fe977e176764c74e': mpeg: Split error resilience bits off into a separate file Conflicts: configure libavcodec/Makefile libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Split error resilience bits off into a separate fileDiego Biurrun2014-06-22
| |
* | Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'Michael Niedermayer2014-06-23
|\| | | | | | | | | | | | | * commit '8d695dc411c1ae28477f107d6f7bf2db59af95df': mpeg: Mark ff_mpeg_set_erpic() static Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Mark ff_mpeg_set_erpic() staticDiego Biurrun2014-06-22
| | | | | | | | It is not used outside of the file.
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun2014-06-18
| |
* | mpeg12enc: add seq_disp_ext option for deciding when to write a ↵Marton Balint2014-06-14
| | | | | | | | | | | | | | sequence_display_extension Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Fix psnr calculation with slice threadsMichael Niedermayer2014-06-13
| | | | | | | | | | | | | | This fixes a race condition and use of the wrong field, which become shared instead of per thread during some AVFrame changes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'Michael Niedermayer2014-05-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off quarterpel bits into their own contextDiego Biurrun2014-05-29
| |
* | Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'Michael Niedermayer2014-05-30
|\| | | | | | | | | | | | | * commit '3832a6590156e6abc575bed51cbffa78617ee5fd': dsputil: Move ff_alternate_*_scan tables to mpegvideo Merged-by: Michael Niedermayer <michaelni@gmx.at>