summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* avcodec/error_resilience: check that er is supported before attempting to ↵Michael Niedermayer2013-12-06
| | | | | | | | read the status of the previous slice Fixes incorrectly set error_occured and improves speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/error_resilience: factor er_supported() check outMichael Niedermayer2013-12-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/qdm2: move static init to normal init to avoid initializing tables ↵Michael Niedermayer2013-12-06
| | | | | | that might never be used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* do O(1) instead of O(n) atomic operations in register functionsMichael Niedermayer2013-12-06
| | | | | | about 1ms faster startup time Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() outMichael Niedermayer2013-12-06
| | | | | | This reduces the amount of duplicated code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegvideo_enc/frame_end(): remove unused variableMichael Niedermayer2013-12-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variableMichael Niedermayer2013-12-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-06
|\ | | | | | | | | | | | | * qatar/master: webp: add a special case for a huffman table with only 1 symbol Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * webp: add a special case for a huffman table with only 1 symbolJustin Ruggles2013-12-05
| | | | | | | | | | | | | | | | | | The vlc reader cannot handle 0-bit huffman codes. For most situations WebP uses the "simple" huffman coding for this case, but that will only handle symbols up to 255. For the LZ77 distance codes, larger symbol values are needed, so it can happen in rare cases that a normal huffman table is used that only has a single symbol.
* | Merge commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e': webp: do not call av_frame_free() on the user-provided frame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * webp: do not call av_frame_free() on the user-provided frameJustin Ruggles2013-12-05
| | | | | | | | Fixes double-free on error.
* | Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * commit 'b73a8922d818c7f909855557718d4c3bfacbd92d': ljpegenc: split yuv encoding into a separate function Conflicts: libavcodec/ljpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpegenc: split yuv encoding into a separate functionAnton Khirnov2013-12-05
| |
* | Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5': ljpegenc: split bgr encoding into a separate function Conflicts: libavcodec/ljpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpegenc: split bgr encoding into a separate functionAnton Khirnov2013-12-05
| |
* | Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daffed3b173c59d64907747bf3309e98a8974f4e': ljpegenc: accept bgr24 instead of bgra Conflicts: libavcodec/ljpegenc.c libavcodec/mjpegenc.c Only whitespace merged, we continue to support both formats Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpegenc: accept bgr24 instead of bgraAnton Khirnov2013-12-05
| | | | | | | | The alpha plane is not encoded.
* | Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * commit '0cdbc4d39394965bd8712395b19160da8f3fe144': ljpegenc: rename the encoding function. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpegenc: rename the encoding function.Anton Khirnov2013-12-05
| | | | | | | | The new name is more consistent with the rest of Libav.
* | Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * commit '72c0b8f724a71d2784aecad0e5221e7ab6206371': ljpeg: remove a commented-out line Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpeg: remove a commented-out lineAnton Khirnov2013-12-05
| |
* | avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()Michael Niedermayer2013-12-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | | | | | | | | | | | 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-06
| | | | | | | | | | | | 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-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer2013-12-06
| | | | | | | | | | | | 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-06
| | | | | | | | | | | | encode_picture_lossless() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * 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-05
| | | | | | | | | | 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-05
| |
* | Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * 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-05
| | | | | | | | It only needs PutBitContext from it, so pass that directly.
* | Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| |
* | Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | | | MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was never written before.
* | Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | | | | | | | | | | | | | | | 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-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | | | This will allow removing the hacks where each decoder sets current_picture_ptr on its own.
* | Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * 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-05
| | | | | | | | | | 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-06
|\| | | | | | | | | | | | | * commit 'c99307caee01441cfde24f3b7b0db3037b7022dc': mpegvideo: make frame_size_alloc() static. Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 09:11:21 +0000