summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | smacker: check smacker_decode_tree() return valueMichael Niedermayer2012-11-301-3/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | undo file modifiers that suck inPaul B Mahol2012-11-303-0/+0
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | Add exception for "gif" in image2 probe() method.Vitaliy E Sugrobov2012-11-303-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | Without this exception files with ".gif" extension by default recognized as input suitable for image2 demuxer rather than gif. In order to pass image through gif demuxer it was necessary to use -f gif option. This change affected 'make fate' test results because previously image2 demuxer and gif decoder took only first frame of multiframe test data, which is no longer true with gif demuxer. Signed-off-by: Vitaliy E Sugrobov <[email protected]>
* | Gif demuxerVitaliy E Sugrobov2012-11-305-3/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <[email protected]>
* | Move some definitions to header file.Vitaliy E Sugrobov2012-11-302-10/+48
| | | | | | | | | | | | Share them with upcoming demuxer module. Signed-off-by: Vitaliy E Sugrobov <[email protected]>
* | Additional checks to prevent overread.Vitaliy E Sugrobov2012-11-301-1/+23
| | | | | | | | | | | | | | Check for availability of some required amount of bytes in buffer before reading further. Signed-off-by: Vitaliy E Sugrobov <[email protected]>
* | Prepare gif decoder for use in conjunction with gif demuxer.Vitaliy E Sugrobov2012-11-302-49/+240
| | | | | | | | | | | | | | | | | | | | | | Add capability of reading multiple frames instead of only first. Implement support for different gif frame 'disposal methods'. Add option that allows to change background color resulting from conversion of gif with transparency to any other format which not support it. Also bump lavc minor version. Signed-off-by: Vitaliy E Sugrobov <[email protected]>
* | Add meaningful error codes and constants.Vitaliy E Sugrobov2012-11-301-16/+24
| | | | | | | | | | | | | | | | | | | | Replace literals with named constants in several pieces of code like 'return -1' and 'case 0xab'. Change the way decoder handles absence of image data in a file: notify gif_decode_frame() caller with got_picture set to zero instead of returning -1. Signed-off-by: Vitaliy E Sugrobov <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-303-3/+6
|\| | | | | | | | | | | | | | | * qatar/master: avutil: Include io.h with a separate condition from MapViewOfFile cmdutils: Use a configure check for enabling CommandLineToArgvW Merged-by: Michael Niedermayer <[email protected]>
| * avutil: Include io.h with a separate condition from MapViewOfFileMartin Storsjö2012-11-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | The existence of MapViewOfFile isn't linked to the existence of io.h. Not all versions of windows have MapViewOfFile (in particular, Windows Phone 8 and the "metro" windows 8 API subset don't), while they still have io.h (and need it for open/read/close). Signed-off-by: Martin Storsjö <[email protected]>
| * cmdutils: Use a configure check for enabling CommandLineToArgvWMartin Storsjö2012-11-292-2/+3
| | | | | | | | | | | | | | | | | | This simplifies the condition to avoid hardcoding the systems where the function exists. This also simplifies support for newer Windows API subsets where this function doesn't exist, such as Windows Phone 8 and the "metro" API subset of Windows 8. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'Michael Niedermayer2012-11-306-132/+148
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320': build: The FLAC encoder also depends on the flacdsp code img2: K&R formatting cosmetics h264: check context state before decoding slice data partitions flashsv: make sure data for zlib priming is available Conflicts: libavcodec/Makefile libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <[email protected]>
| * build: The FLAC encoder also depends on the flacdsp codeDiego Biurrun2012-11-291-1/+1
| | | | | | | | Fixes linking with only the FLAC encoder enabled.
| * img2: K&R formatting cosmeticsDiego Biurrun2012-11-293-120/+131
| | | | | | | | Also introduce local img_ namespace to simplify debugging.
| * h264: check context state before decoding slice data partitionsJanne Grunau2012-11-291-0/+1
| | | | | | | | | | | | | | Fixes mov_h264_aac__Demo_FlagOfOurFathers.mov.SIGSEGV.4e9.656. Found-by: Mateusz "j00ru" Jurczyk CC: [email protected]
| * flashsv: make sure data for zlib priming is availableJanne Grunau2012-11-291-0/+5
| | | | | | | | | | | | Fixes a segfault in the fuzzed sample resolutionchange.flv_s314809. CC: [email protected]
* | configure: add lavfi avr dep to .pc when required.Clément Bœsch2012-11-301-0/+1
| |
* | adpcm/thp: cosmetics: reindentPaul B Mahol2012-11-301-2/+2
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | iff: fix some incorrect interpretations of invalid filesPaul B Mahol2012-11-301-3/+4
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | iff: MAUD supportPaul B Mahol2012-11-301-5/+61
| | | | | | | | | | Based on patch by Piotr Bandurski Signed-off-by: Paul B Mahol <[email protected]>
* | Correctly skip strf tag for subtitles when decoding avi.Carl Eugen Hoyos2012-11-301-0/+1
| | | | | | | | Fixes ticket #1797.
* | lavc: fix duplicate stats_out line.Michael Niedermayer2012-11-301-0/+3
| | | | | | | | | | Found-by: Thierry Foucu Signed-off-by: Michael Niedermayer <[email protected]>
* | mjpegdec: print error message when quant_index is invalidMichael Niedermayer2012-11-301-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | mjpegdec: check h/v_count, fix context becoming inconsistent and causing out ↵Michael Niedermayer2012-11-301-12/+18
| | | | | | | | | | | | | | | | | | of array accesses. This also fixes a long standing comment in the code. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | lavu/opt: change the way default pixel and sample format value is setStefano Sabatini2012-11-306-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the i64 field rather than the string value. Using a string to set a default sample/pixel format is weird, also the new interface is more consistent with the rest of the API. This is technically an API break, but hopefully there are no applications using this feature outside of FFmpeg. In order to save backward compatibility with mixed libraries in case libavutil is updated but not the other libraries, some ifdeffery hacks are added. Note that the version check is only performed when class->version != 0, since if it is not defined then we assume that no version was defined and the class is not affected by the change. We will luckily get rid of the hack at the next major bump.
* | vble: check packet size.Michael Niedermayer2012-11-291-0/+5
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | id3v2: check index against buffer size. Fix out of array accessMichael Niedermayer2012-11-291-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | iff: mention all decodersPiotr Bandurski2012-11-291-2/+2
| |
* | BRSTM demuxerPaul B Mahol2012-11-296-1/+300
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | huffyuvdec: check width more completely, avoid out of array accessesMichael Niedermayer2012-11-291-1/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | tiffdec: better checks for bitstream offsets, fixes out of array readsMichael Niedermayer2012-11-291-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | roqvideodec: check dimensions validityMichael Niedermayer2012-11-291-0/+6
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | fate: add tak dependenciesPaul B Mahol2012-11-291-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | fate: add ADPCM 4XM testPaul B Mahol2012-11-292-0/+30
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-291-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avplay: Do not use removed av_get_int() avconv: fix variable shadowing in configure_input_audio_filter() Conflicts: ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <[email protected]>
| * avplay: Do not use removed av_get_int()Anton Khirnov2012-11-291-3/+3
| | | | | | | | | | | | Fixes build with lavfi disabled. Signed-off-by: Diego Biurrun <[email protected]>
| * avconv: fix variable shadowing in configure_input_audio_filter()Justin Ruggles2012-11-281-1/+0
| |
* | Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'Michael Niedermayer2012-11-296-26/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd': fate: h264: Add dependencies fate: ea: Add dependencies fate: Do not unconditionally run libavutil tests rtpenc_chain: Remove unused variable nuv: check for malloc failure when allocating extradata nuv: use the stream indices generated by avformat_new_stream() Conflicts: tests/fate/ea.mak Merged-by: Michael Niedermayer <[email protected]>
| * fate: h264: Add dependenciesDiego Biurrun2012-11-281-4/+6
| |
| * fate: ea: Add dependenciesDiego Biurrun2012-11-281-7/+10
| |
| * fate: Do not unconditionally run libavutil testsDiego Biurrun2012-11-282-1/+1
| | | | | | | | Now that libavutil can be disabled, this should be conditional.
| * rtpenc_chain: Remove unused variableDiego Biurrun2012-11-281-1/+1
| |
| * nuv: check for malloc failure when allocating extradataJustin Ruggles2012-11-281-6/+14
| | | | | | | | | | | | | | Also make sure extradata is freed in the case where multiple NUV_EXTRADATA frame types are found. This may not happen in practice, but it could happen in a malformed stream, which would lead to a memleak if not handled.
| * nuv: use the stream indices generated by avformat_new_stream()Justin Ruggles2012-11-281-5/+6
| |
* | Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'Michael Niedermayer2012-11-291-136/+151
|\| | | | | | | | | | | | | | | | | | | * commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b': nuv: cosmetics: pretty-printing Conflicts: libavformat/nuv.c Merged-by: Michael Niedermayer <[email protected]>
| * nuv: cosmetics: pretty-printingJustin Ruggles2012-11-281-132/+147
| |
* | Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'Michael Niedermayer2012-11-295-45/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66': lavf: move nuv fourcc audio tags from riff to nuv lavf: add a common function for selecting a pcm codec from parameters Conflicts: libavformat/internal.h libavformat/mov.c libavformat/riff.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: move nuv fourcc audio tags from riff to nuvJustin Ruggles2012-11-282-8/+20
| |
| * lavf: add a common function for selecting a pcm codec from parametersJustin Ruggles2012-11-284-36/+57
| |
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-2923-93/+87
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <[email protected]>