aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dvenc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'Michael Niedermayer2014-08-031-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300': dv: Update DV-profile-related functions to current public API Conflicts: libavcodec/dvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Update DV-profile-related functions to current public APIDiego Biurrun2014-08-021-1/+1
| |
* | avcodec/dvenc: clear all dsp contextsMichael Niedermayer2014-07-181-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-171-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-171-5/+5
| |
* | Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'Michael Niedermayer2014-07-101-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-091-1/+4
| |
* | Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer2014-07-091-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov2014-07-091-0/+1
| |
* | Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'Michael Niedermayer2014-07-081-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-071-2/+5
| |
* | Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'Michael Niedermayer2014-06-271-0/+12
|\| | | | | | | | | | | | | | | | | | | * commit 'e63b818dbe6060b606ae10eb184859f8b97d2353': dv: Properly split decoder and encoder initialization Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Properly split decoder and encoder initializationDiego Biurrun2014-06-271-0/+11
| |
* | Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'Michael Niedermayer2014-06-201-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f': dv: get rid of global non-const tables Conflicts: libavcodec/dv_profile.h libavcodec/dvdec.c libavcodec/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: get rid of global non-const tablesAnton Khirnov2014-06-201-2/+2
| | | | | | | | Instead, store them in the context and compute on each parameter change.
* | Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'Michael Niedermayer2014-06-201-4/+10
|\| | | | | | | | | | | | | | | | | | | * commit '778111592bf5f38630858ee6dfcfd097cd6c6da9': dvenc: initialize the profile only once, at init Conflicts: libavcodec/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dvenc: initialize the profile only once, at initAnton Khirnov2014-06-201-4/+10
| | | | | | | | | | We do not allow the frame parameters to change during encoding, so there is no need to do this for each frame.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-051-1/+1
|\| | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: Move DV-specific ff_zigzag248_direct table to dvdata Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move DV-specific ff_zigzag248_direct table to dvdataDiego Biurrun2014-04-041-1/+1
| |
* | Merge commit '984e3398662d460e15904f9e4a6df9ef759070cb'Michael Niedermayer2014-02-201-2/+2
|\| | | | | | | | | | | | | * commit '984e3398662d460e15904f9e4a6df9ef759070cb': avcodec: Consistently name encoder init functions foo_encode_init Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Consistently name encoder init functions foo_encode_initDiego Biurrun2014-02-201-2/+2
| |
* | Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'Michael Niedermayer2013-12-091-12/+23
|\| | | | | | | | | | | | | | | | | | | * commit 'd4f1188d1a662fed5347e70016da49e01563e8a8': dv: use AVFrame API properly Conflicts: libavcodec/dvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: use AVFrame API properlyAnton Khirnov2013-12-091-11/+22
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-021-16/+19
|/ | | | | | | | | | * qatar/master: dv: Split off DV video encoder into its own file Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* dv: Split off DV video encoder into its own fileDiego Biurrun2013-12-021-0/+698