aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer2013-12-064-112/+153
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24abd806ea0cfb0d988d2f0044eac79cff12918c': ljpegenc: deMpegEncContextize Conflicts: libavcodec/ljpegenc.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c tests/ref/vsynth/vsynth1-ljpeg tests/ref/vsynth/vsynth2-ljpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpegenc: deMpegEncContextizeAnton Khirnov2013-12-053-82/+134
| | | | | | | | | | | | | | | | | | The encoder uses almost none of the mpegvideo infrastructure, only some fields from MpegEncContext. The FATE results change because now an all-zero quant matrix is written into the file. Since it is not used for anything for ljpeg, this should not be a problem.
* | avcodec/ljpegenc: Dont use ff_mjpeg_encode_stuffing()Michael Niedermayer2013-12-061-1/+1
| | | | | | | | | | | | This avoids a use of MpegEncContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()Michael Niedermayer2013-12-061-5/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer2013-12-062-2/+3
| | | | | | | | | | | | This will be used by ljpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ljpegenc: fix mem allocation failure return code ↵Michael Niedermayer2013-12-061-1/+1
| | | | | | | | | | | | encode_picture_lossless() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer2013-12-063-15/+15
|\| | | | | | | | | | | | | | | | | | | * commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc() Conflicts: libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()Anton Khirnov2013-12-053-15/+15
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer2013-12-064-14/+13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer() Conflicts: libavcodec/ljpegenc.c libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()Anton Khirnov2013-12-054-14/+14
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer2013-12-064-53/+86
|\| | | | | | | | | | | | | | | | | | | * commit '058d5f2feb730846f22c1812e433f92f670ad751': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()Anton Khirnov2013-12-054-47/+74
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'Michael Niedermayer2013-12-061-8/+10
|\| | | | | | | | | | | | | * commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7': mjpegenc: do not pass MpegEncContext to jpeg_table_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to jpeg_table_header()Anton Khirnov2013-12-051-5/+5
| | | | | | | | | | Pass the three needed fields from it directly. This will allow to deMpegEncContextize the LJPEG encoder.
| * mjpegenc: remove commented out never-to-be-finished WIP cruftAnton Khirnov2013-12-051-25/+0
| |
* | Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'Michael Niedermayer2013-12-061-6/+5
|\| | | | | | | | | | | | | * commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9': mjpegenc: do not pass MpegEncContext to put_huffman_table() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to put_huffman_table()Anton Khirnov2013-12-051-6/+5
| | | | | | | | It only needs PutBitContext from it, so pass that directly.
* | Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'Michael Niedermayer2013-12-061-15/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'a1ba1f20b350cb89e645f17bdb237d027170db33': mjpegenc: cosmetics, reformat jpeg_put_comments() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: cosmetics, reformat jpeg_put_comments()Anton Khirnov2013-12-051-15/+14
| |
* | Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'Michael Niedermayer2013-12-061-10/+9
|\| | | | | | | | | | | | | | | | | | | | | * commit '0812f5a40a0a190172b6de6e91755b882472ddc5': mjpegenc: write the JFIF header if the sample aspect ratio is set Conflicts: libavcodec/mjpegenc.c See: f3ce748d3453a490f32a5518f9cf6bef6892a30c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: write the JFIF header if the sample aspect ratio is setAnton Khirnov2013-12-051-10/+9
| | | | | | | | | | MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was never written before.
* | Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'Michael Niedermayer2013-12-063-25/+0
|\| | | | | | | | | | | | | | | | | | | * commit '66499f34b56fc6a9fdef25543bd9d576fc787895': mpegvideo: do not set current_picture_ptr in decoders Conflicts: libavcodec/mss2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: do not set current_picture_ptr in decodersAnton Khirnov2013-12-053-25/+0
| | | | | | | | | | | | | | | | | | | | | | This code was originally added in 5f1948111a4920ff74e31b4284ab0200f7938539 to h263 to set decoded frame pts to some random numbers (removed in a1c5cc429d99216406170eac7e8352860076d3e8) and then cargo culted to other decoders. The code is left in h263dec for now, since some part of the decoder (apparently OBMC) relies on the specific previous frame to be reused.
* | Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'Michael Niedermayer2013-12-061-12/+12
|\| | | | | | | | | | | | | | | | | | | * commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90': vc1dec: move setting repeat_pict after frame_start() has been called. Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: move setting repeat_pict after frame_start() has been called.Anton Khirnov2013-12-051-12/+12
| | | | | | | | | | This will allow removing the hacks where each decoder sets current_picture_ptr on its own.
* | Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'Michael Niedermayer2013-12-062-6/+3
|\| | | | | | | | | | | | | * commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848': mpegvideo: make ff_release_unused_pictures() static Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: make ff_release_unused_pictures() staticAnton Khirnov2013-12-052-6/+3
| | | | | | | | | | It is only called from one place in mpegvideo.c now. Also remove the remove_current parameter, which is always 1.
* | Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'Michael Niedermayer2013-12-063-9/+12
|\| | | | | | | | | | | | | * commit 'c99307caee01441cfde24f3b7b0db3037b7022dc': mpegvideo: make frame_size_alloc() static. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: make frame_size_alloc() static.Anton Khirnov2013-12-052-5/+4
| | | | | | | | It is not called from outside of mpegvideo.c anymore.
* | Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'Michael Niedermayer2013-12-063-27/+29
|\| | | | | | | | | | | | | | | | | | | * commit '0b0a7a751de02464a33717e70352f696372ba1c4': mpegvideo: move encode-only parts of common_end() to encode_end() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move encode-only parts of common_end() to encode_end()Anton Khirnov2013-12-053-22/+24
| |
* | Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'Michael Niedermayer2013-12-061-18/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d': mpegvideo: remove commented out cruft from ff_MPV_frame_end() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove commented out cruft from ff_MPV_frame_end()Anton Khirnov2013-12-051-18/+0
| |
* | avcodec/mpegvideo_enc: fix linesizes in frame_end()Michael Niedermayer2013-12-061-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'Michael Niedermayer2013-12-062-10/+38
|\| | | | | | | | | | | | | | | | | | | * commit '381a722562bcc0b623acf6a00a583fe989bcb72a': mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a ↵Anton Khirnov2013-12-052-19/+46
| | | | | | | | separate function
* | Merge commit 'b7254288d222013e20539c530b1ec5d324ed5352'Michael Niedermayer2013-12-061-4/+0
|\| | | | | | | | | | | | | * commit 'b7254288d222013e20539c530b1ec5d324ed5352': mpegvideo: do not update last_non_b_pict_type in update_thread_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: do not update last_non_b_pict_type in update_thread_context()Anton Khirnov2013-12-051-4/+0
| | | | | | | | It is used for encoding only.
* | Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'Michael Niedermayer2013-12-062-24/+28
|\| | | | | | | | | | | | | | | | | | | | | * commit '1f8eb69079880ef1f394c498dfdf471f91222a06': mpegvideo: move encoding-only initialization from common_init() to encode_init() Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move encoding-only initialization from common_init() to encode_init()Anton Khirnov2013-12-052-31/+26
| |
* | Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'Michael Niedermayer2013-12-062-3/+3
|\| | | | | | | | | | | | | * commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0': mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move setting encoding-only vars from common_defaults() to ↵Anton Khirnov2013-12-052-3/+3
| | | | | | | | encode_defaults()
* | Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'Michael Niedermayer2013-12-061-1/+0
|\| | | | | | | | | | | | | * commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a': mpegvideo: don't copy input_picture_number in update_thread_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: don't copy input_picture_number in update_thread_context()Anton Khirnov2013-12-051-1/+0
| | | | | | | | It is encoding-only, frame threading is not used for encoding.
* | Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer2013-12-064-4/+5
|\| | | | | | | | | | | | | | | | | | | * commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55': mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-053-3/+4
| |
* | Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer2013-12-064-7/+8
|\| | | | | | | | | | | | | | | | | | | * commit 'f7d228676cb7669059889c4225c8a8dc56708c24': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContextAnton Khirnov2013-12-054-7/+8
| |
* | Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'Michael Niedermayer2013-12-062-5/+5
|\| | | | | | | | | | | | | | | | | | | * commit 'a097f0049b28dc3ed13625e4a42619292c92492f': mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: move first_slice from MpegEncContext to Mpeg1ContextAnton Khirnov2013-12-052-4/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 10:41:17 +0000