summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: remove references to unused EXTRAOBJS variableMans Rullgard2012-10-10
| | | | | | | | | | | | This was part of a ghastly hack that is long since gone. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-10
| | | | | | | | | | | | | | A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: add h263 obmc vsynth testsJanne Grunau2012-10-10
| |
| * avconv: remove bogus warning when using avconv -h without parameterJanne Grunau2012-10-10
| |
| * averror: explicitly define AVERROR_* valuesJanne Grunau2012-10-10
| |
| * flashsv: propagate inflateReset() errorsJanne Grunau2012-10-10
| | | | | | | | Fixes CID717493.
| * indeo4/5: remove constant parameter num_bands from wavelet recompositionJanne Grunau2012-10-10
| | | | | | | | Fixes bogus uninitialized value compiler and coverity warnings.
| * mxfdec: return error if no segments are available in ↵Janne Grunau2012-10-10
| | | | | | | | | | | | mxf_get_sorted_table_segments Fixes CID732275.
| * Double motion vector range for HPEL interlaced picture in proper placeMashiat Sarker Shakkhar2012-10-10
| | | | | | | | | | | | | | The existing code is not in the right place and it should cover both interlaced frame and field pictures. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | * commit 'eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf': vc1dec: Set opposite to the correct value for 1REF field pictures Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Set opposite to the correct value for 1REF field picturesMashiat Sarker Shakkhar2012-10-10
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | * commit '7cc3c4e1d4179aeabcd891090e31ee5e5bfd9692': vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chroma Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Invoke edge emulation regardless of MV precision for 1-MV chromaMashiat Sarker Shakkhar2012-10-10
| | | | | | | | | | | | | | | | | | | | This is required due to the way VC-1 handles chroma pull-back which may end up causing negative chroma MV for zero luma MV. Edge emulation needs to be invoked in such cases. This only affects vertical component of chroma motion vector. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c': vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures segment: support applehttp style list Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Set chroma reference field from REFFIELD for 1REF field picturesMashiat Sarker Shakkhar2012-10-10
| | | | | | | | | | | | | | | | Interlaced field pictures can have one or two reference pictures, signaled by NUMREF syntax element. For single reference pictures, reference picture is determined by REFFIELD syntax element. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * segment: support applehttp style listLuca Barbato2012-10-10
| |
* | Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6': avio: introduce avio_closep mpegtsenc: set muxing type notification to verbose vc1dec: Use correct spelling of "opposite" a64multienc: change mc_frame_counter to unsigned arm: call arm-specific rv34dsp init functions under if (ARCH_ARM) svq1: Drop a bunch of useless parentheses parseutils-test: do not print numerical error codes svq1: K&R formatting cosmetics Conflicts: doc/APIchanges libavcodec/svq1dec.c libavcodec/svq1enc.c libavformat/version.h libavutil/parseutils.c tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: introduce avio_closepLuca Barbato2012-10-10
| |
| * mpegtsenc: set muxing type notification to verboseLuca Barbato2012-10-10
| |
| * vc1dec: Use correct spelling of "opposite"Mashiat Sarker Shakkhar2012-10-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * a64multienc: change mc_frame_counter to unsignedJanne Grunau2012-10-10
| | | | | | | | | | | | | | | | | | | | GCC cannot proof that c->mc_frame_counter is always >- 0, changing the type from int to unsigned fixes following warning: libavcodec/a64multienc.c: In function ‘a64multi_encode_frame’: libavcodec/a64multienc.c:342:17: warning: ‘buf’ may be used uninitialized in this function[-Wuninitialized] Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)Jean-Baptiste Kempf2012-10-10
| | | | | | | | | | | | | | Assign NEON specific function pointers after runtime check via av_get_cpu_flags(). Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * svq1: Drop a bunch of useless parenthesesDiego Biurrun2012-10-10
| |
| * parseutils-test: do not print numerical error codesMans Rullgard2012-10-10
| | | | | | | | | | | | | | The error codes differ between systems so printing the value makes the fate test fail on some systems. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * svq1: K&R formatting cosmeticsDiego Biurrun2012-10-10
| |
* | Revert "configure: link flite against libasound"Stefano Sabatini2012-10-11
| | | | | | | | | | | | | | | | | | This reverts commit 396648cc6a3eb5c00c698555fa4ddd631bf6664d. The commit made impossible to build against libflite if libasound is not available (e.g. on Windows). Thus remove the -lasound flag. In case of libflite static linking the workaround is to enable --extra-ldflags=-lasound (or disable the ALSA output device in libflite).
* | configure: link flite against libasoundStefano Sabatini2012-10-11
| | | | | | | | | | | | | | libflite depends on libasound. Fix a linking failure when linking against a static version of libflite. Reported-by: Vladimir Kraljevic
* | pcx: convert to bytestream2 APIPaul B Mahol2012-10-11
| | | | | | | | | | | | Protects against overreads in input buffer. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | av_opt_set_from_string: fix memleakMichael Niedermayer2012-10-11
| | | | | | | | | | Fixes CID733801 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swri_resample_init: unsupported sample formats are an internal error.Michael Niedermayer2012-10-11
| | | | | | | | | | | | | | This condition cannot happen. Fixes CID733802 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: dont fail for sameq/same_quant.Michael Niedermayer2012-10-11
| | | | | | | | | | | | Instead print a warning. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: fix use of uninitialized pointer in av_strtok()Michael Niedermayer2012-10-11
| | | | | | | | | | Fixes CID733837 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_volumedetect: fix use of uninitilaized variable in case of planar audio.Michael Niedermayer2012-10-11
| | | | | | | | | | Fixes: CID733841 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok()Michael Niedermayer2012-10-11
| | | | | | | | | | Fixes CID733842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sha: change loop condition to be tighter.Michael Niedermayer2012-10-11
| | | | | | | | | | | | | | This makes no change to the way the code functions, but should make it easier for static analyzers to see the valid range for i Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale-test: fix freeing of uninitialized variableMichael Niedermayer2012-10-11
| | | | | | | | | | Fixes: CID733844 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add vf_idet filter to lavfi regression testsMatthieu Bouron2012-10-11
| | | | | | | | | | | | | | This test only make sure that the idet filter does not crash. Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: zero pointers after freeing referencesMichael Niedermayer2012-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_idet: fix free after useMichael Niedermayer2012-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix broken timestamps for some mp3 in avi samples.Carl Eugen Hoyos2012-10-10
| | | | | | | | | | Mostly based on 73ad355 by Michael Niedermayer. Fixes ticket #606.
* | lavf: do not prematurely accept a format with low score in init_input()Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: detect .raw files only with a low score as img2Michael Niedermayer2012-10-10
| | | | | | | | | | | | They can be many other things and this otherwise breaks probing of some .raw files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values.Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: docs: the field_order is set by the demuxer and not libavcodec for ↵Michael Niedermayer2012-10-10
| | | | | | | | | | | | | | | | decoding This makes the documentation match the implementation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qt-faststart: fix printf argument typeMichael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | txd: remove duplicated header inclusionPaul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dtshd: fix seekingPaul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avidec: fix 10l typoMichael Niedermayer2012-10-10
| | | | | | | | | | found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: override sample size of 1024 for VBR AACMichael Niedermayer2012-10-10
| | | | | | | | | | | | Fixes Ticket1755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>