aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-307-140/+223
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing() h264: Make ff_h264_decode_end() static, it is not used externally. output-example: K&R formatting cosmetics, comment spelling fixes avf: make the example output the proper message avf: fix audio writing in the output-example mov: don't overwrite existing indexes. lzw: fix potential integer overflow. truemotion: forbid invalid VLC bitsizes and token values. truemotion2: handle out-of-frame motion vectors through edge extension. configure: Check for a different SDL function Conflicts: configure doc/examples/muxing.c libavcodec/truemotion2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()Diego Biurrun2012-03-301-2/+2
| |
| * h264: Make ff_h264_decode_end() static, it is not used externally.Diego Biurrun2012-03-302-4/+3
| | | | | | | | Also drop the now unnecessary ff_ prefix from its name.
| * output-example: K&R formatting cosmetics, comment spelling fixesDiego Biurrun2012-03-301-97/+100
| |
| * avf: make the example output the proper messageLuca Barbato2012-03-291-2/+2
| | | | | | | | | | av_dump_format needs the codecs opened in order to print them.
| * avf: fix audio writing in the output-exampleLuca Barbato2012-03-291-1/+1
| | | | | | | | | | av_init_packet does not reset data and size fields in AVPacket, avcodec_encode_audio2 can use preallocated AVPacket.
| * mov: don't overwrite existing indexes.Ronald S. Bultje2012-03-291-8/+11
| | | | | | | | | | | | | | | | Prevents all kind of badness if files contain multiple indexes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * lzw: fix potential integer overflow.Ronald S. Bultje2012-03-291-1/+1
| |
| * truemotion: forbid invalid VLC bitsizes and token values.Ronald S. Bultje2012-03-291-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | SHOW_UBITS() is only defined up to n_bits is 25, therefore forbid values larger than this in get_vlc2() (max_bits). tokens[][] can be used as an index in deltas[], which has a size of 64, so ensure the values are smaller than that. This prevents crashes on corrupt bitstreams. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * truemotion2: handle out-of-frame motion vectors through edge extension.Ronald S. Bultje2012-03-291-27/+90
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * configure: Check for a different SDL functionMartin Storsjö2012-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This one is available both in SDL 1.2 and in 1.3 (which is the current version available e.g. in macports), while 1.3 doesn't contain SDL_Linked_Version(). The current check for SDL_Linked_Version() (available since SDL 1.2.13) was added in 8f1b06c8, because including the headers for SDL_Init() redirects the main() function, requiring the main function signature to match the one of SDL_main (including argc/argv). Signed-off-by: Martin Storsjö <martin@martin.st>
* | svq3: Fix pointer type mismatch warning.Michael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: initialize all tables to zeros.Michael Niedermayer2012-03-301-9/+9
| | | | | | | | | | | | | | This ensures that they dont contain invalid values. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1enc: fix ptr type mismatch warningMichael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeghaudiodec: Fix "set but not used" warningsMichael Niedermayer2012-03-301-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Fix "assignment from incompatible pointer type" warningsMichael Niedermayer2012-03-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kenc: Fix "function declaration isn’t a prototype" warningMichael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: fix format stringsMichael Niedermayer2012-03-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | interplayvideodec: pass correct pointer to av_dlog()Michael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvbsubdec: Fix "set but not used" warningMichael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat: Fix several "incompatible pointer type" warnings.Michael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: ensure the tables have been allocated before using themMichael Niedermayer2012-03-301-0/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-305-36/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mp3dec: perform I/S and M/S only when frame mode is joint stereo. id3v2: add another mimetype for JPEG image lzw: prevent buffer overreads. WMAL: Remove inaccurate and unnecessary doxy h264: fix cabac-on-stack after safe cabac reader. truemotion2: convert packet header reading to bytestream2. Conflicts: libavcodec/lzw.c libavcodec/truemotion2.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: perform I/S and M/S only when frame mode is joint stereo.Kostya Shishkov2012-03-291-1/+1
| | | | | | | | | | | | Looks like some LAME versions produce dual stereo mode MP3s with flags for intensity and middle stereo set. In this mode those flags should be ignored like the reference decoder and derived ones do.
| * id3v2: add another mimetype for JPEG imageKostya Shishkov2012-03-291-0/+1
| |
| * lzw: prevent buffer overreads.Ronald S. Bultje2012-03-281-3/+8
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * WMAL: Remove inaccurate and unnecessary doxyMashiat Sarker Shakkhar2012-03-291-8/+0
| | | | | | | | | | | | | | | | A call to decode_packet() does not always decode a complete WMA packet. Moreover, this is not the correct place to document calls that are part of the public API. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * h264: fix cabac-on-stack after safe cabac reader.Ronald S. Bultje2012-03-281-0/+1
| |
| * truemotion2: convert packet header reading to bytestream2.Ronald S. Bultje2012-03-281-23/+31
| | | | | | | | | | | | | | | | Also use correct buffer sizes in calls to tm2_read_stream(). Together, this prevents overreads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | img2dec: remove GLOB_TILDE support.Michael Niedermayer2012-03-301-7/+1
| | | | | | | | | | | | | | tilde expansion should/can be done by the shell Reviewed-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: Recognize glob meta chars only if prefixed by %Alexander Strasser2012-03-301-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes globbing support to only be used if the character contains at least one glob meta character that is preceded by an unescaped %. To escape a literal % one would use %% which is identical to the way to match a % with image2 sequence generation feature. * Makes it possible to have patterns like %04d-[720p].jpg work again with sequence number generation. Previously this would always be detected as a glob pattern and was interpreted by the image2 glob code instead. * Makes it possible to use %*-[720p].jpg to match above pattern without having to double escape it to be not interpreted by most shells and not by the image2 glob code (previously one would need to use \*-\\\[720p\\\].jpg to achieve the same) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2: glob matching for image seriesBrian Olson2012-03-303-3/+77
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: check pts like dts for being in the past.Michael Niedermayer2012-03-291-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print ts values in pts < dts error messageMichael Niedermayer2012-03-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: switch duration calculation code from avg to r frame_rate.Michael Niedermayer2012-03-291-1/+3
| | | | | | | | | | | | This heuristic is less likely to overshoot and cause encoder failure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not try to use lowres for unusual jpg subsampling.Carl Eugen Hoyos2012-03-291-0/+4
| | | | | | | | Fixes ticket #1144.
* | Revert "Fix compilation with hardcoded tables."Carl Eugen Hoyos2012-03-291-1/+0
| | | | | | | | This reverts commit b17b2963692f5f7c19a2188e61922e00680c5fb4.
* | fate/vp8-size-change: set bitexact flagMichael Niedermayer2012-03-292-28/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: pass bitexact flag to vsrc_bufferMichael Niedermayer2012-03-291-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff: prevent a possible crash with broken/prepared IFF PBMPiotr Bandurski2012-03-291-1/+4
| | | | | | | | | | | | Based on fix by Peter Ross for ticket #1054. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-EncoderMichael Niedermayer2012-03-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | * git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder: Fixes ticket 1127. I'm still looking into why bpp is getting set to 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fixes ticket 1127.Michael Bradshaw2012-03-281-1/+1
| | | | | | | | | | | | I'm still looking into why bpp is getting set to 0.
* | | ffmpeg: dont disable dr1 when changing dimensions are encountered in ↵Michael Niedermayer2012-03-291-1/+0
| | | | | | | | | | | | | | | | | | codec_get_buffer(). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: disable dr1 when frame sizes change.Michael Niedermayer2012-03-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dr1 seems to work fine with frame size changes but many filters cant handle it yet. Simply disabling it forces the alternative non dr1 code path which has been tested more completely and is known to handle frame size changes in a wider varity of cases. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter: set w/h in avfilter_fill_frame_from_video_buffer_ref().Michael Niedermayer2012-03-291-0/+2
| | | | | | | | | | | | | | | | | | This fixes issues with AVFrame w/h being wrong in some cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2960-293/+604
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asf: only set index_read if the index contained entries. cabac: add overread protection to BRANCHLESS_GET_CABAC(). cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC(). cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE(). cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC(). h264: add overread protection to get_cabac_bypass_sign_x86(). h264: reindent get_cabac_bypass_sign_x86(). h264: use struct offsets in get_cabac_bypass_sign_x86(). h264: fix overreads in cabac reader. wmall: fix seeking. lagarith: fix buffer overreads. dvdec: drop unnecessary dv_tablegen.h #include build: fix doc generation errors in parallel builds Replace memset(0) by zero initializations. faandct: Remove FAAN_POSTSCALE define and related code. dvenc: print allowed profiles if the video doesn't conform to any of them. avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. FATE: add a test for vp8 with changing frame size. fate: add kgv1 fate test. oggdec: calculate correct timestamps in Ogg/FLAC Conflicts: libavcodec/4xm.c libavcodec/cook.c libavcodec/dvdata.c libavcodec/dvdsubdec.c libavcodec/lagarith.c libavcodec/lagarithrac.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: only set index_read if the index contained entries.Ronald S. Bultje2012-03-281-1/+1
| | | | | | | | | | This allows falling back to a binary search if the file contains no index, thus fixing seeking in such files (e.g. luckynight.wma).
| * cabac: add overread protection to BRANCHLESS_GET_CABAC().Ronald S. Bultje2012-03-282-11/+22
| | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().Ronald S. Bultje2012-03-281-12/+12
| |
| * cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().Ronald S. Bultje2012-03-281-3/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 21:01:05 +0000