summaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo.h
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '9bb11be0e5a75782c3139ad058c2b571499aa37d'Michael Niedermayer2015-06-081-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-081-1/+5
| | | | | | | | | | | | | | | | | | 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-081-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-081-0/+2
| | | | | | | | | | Use more generic arguments and remove its static attribute since it will be moved to a separate file.
* | Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'Michael Niedermayer2015-06-081-4/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-4/+9
| |
* | Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'Michael Niedermayer2015-06-011-87/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '149fa0b7ac180fe1df48a2e379c560813555bf57': mpegvideo: Move MotionEstContext and function declarations to a separate header Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move MotionEstContext and function declarations to a separate headerVittorio Giovara2015-05-311-87/+1
| |
* | Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'Michael Niedermayer2015-06-011-7/+0
|\ \ | |/ | | | | | | | | | | * commit 'b2b766914a49c4e3537df3a585e97b98d432edd2': mpegvideo: mpeg12: Move function declarations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: mpeg12: Move function declarationsVittorio Giovara2015-05-311-7/+0
| |
* | Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'Michael Niedermayer2015-06-011-8/+0
|\ \ | |/ | | | | | | | | | | * 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-311-8/+0
| |
* | Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'Michael Niedermayer2015-06-011-12/+0
|\ \ | |/ | | | | | | | | | | * commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332': mpegvideo: msmpeg4: Move function declarations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: msmpeg4: Move function declarationsVittorio Giovara2015-05-311-12/+0
| |
* | Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'Michael Niedermayer2015-06-011-11/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-311-11/+0
| |
* | Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'Michael Niedermayer2015-05-281-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-281-1/+0
| |
* | avcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() outMichael Niedermayer2015-05-251-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'Michael Niedermayer2015-05-221-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-221-1/+2
| |
* | Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'Michael Niedermayer2015-05-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-221-1/+1
| |
* | Merge commit 'd528045558825f01472e9bee873f60c98d661e53'Michael Niedermayer2015-05-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-221-1/+1
| | | | | | | | | | 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 '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'Michael Niedermayer2015-05-221-1/+0
|\ \ | |/ | | | | | | | | | | * commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc': mpegvideo: Drop stream_codec_tag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop stream_codec_tagVittorio Giovara2015-05-221-1/+0
| | | | | | | | The field is unused.
* | Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'Michael Niedermayer2015-05-221-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Drop err_recognitionVittorio Giovara2015-05-221-1/+0
| | | | | | | | It is just a duplicate of an AVCodecContext member so use it instead.
* | Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'Michael Niedermayer2015-05-221-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42': mpegvideo: Drop flags and flags2 Conflicts: libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/ratecontrol.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop flags and flags2Vittorio Giovara2015-05-221-2/+0
| | | | | | | | They are just duplicates of AVCodecContext members so use those instead.
| * rv10: check size of s->mb_width * s->mb_heightAndreas Cadhalpun2015-03-051-1/+1
| | | | | | | | | | | | | | If it doesn't fit into 12 bits it triggers an assertion. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/rv10: check size of s->mb_width * s->mb_heightAndreas Cadhalpun2015-03-031-1/+1
| | | | | | | | | | | | | | If it doesn't fit into 12 bits it triggers an assertion. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: Add intra_chroma_ac_vlc_length, it will be needed for ↵Michael Niedermayer2015-02-111-0/+2
| | | | | | | | | | | | mjpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'Michael Niedermayer2015-01-071-1/+1
|\ \ | |/ | | | | | | | | | | * 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-061-1/+1
| | | | | | | | Bug-Id: CID 1257781
* | Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'Michael Niedermayer2014-12-151-5/+0
|\ \ | |/ | | | | | | | | | | * 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-151-5/+0
| | | | | | | | Drop an unused #undef from h264 decoder.
* | Merge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'Michael Niedermayer2014-12-151-1/+0
|\ \ | |/ | | | | | | | | | | * commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8': mpegvideo: remove unused function declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove unused function declarationVittorio Giovara2014-12-151-1/+0
| |
| * mpegvideo: fix size of arrayVittorio Giovara2014-11-111-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238789
* | Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'Michael Niedermayer2014-11-111-1/+1
|\ \ | |/ | | | | | | | | | | | | * 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-111-1/+1
| | | | | | | | | | | | 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-181-0/+2
| | | | | | | | | | | | | | | | 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-181-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-181-0/+3
| |
* | Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'Michael Niedermayer2014-10-181-0/+2
|\ \ | |/ | | | | | | | | | | * 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-181-0/+2
| |
* | Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'Michael Niedermayer2014-10-181-1/+5
|\ \ | |/ | | | | | | | | | | * 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-181-1/+5
| | | | | | | | mpegvideo encoders
OpenPOWER on IntegriCloud