summaryrefslogtreecommitdiff
path: root/libavcodec
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>
| * 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.
| * 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>
* | 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>
| * 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
| |
| * svq1: K&R formatting cosmeticsDiego Biurrun2012-10-10
| |
* | pcx: convert to bytestream2 APIPaul B Mahol2012-10-11
| | | | | | | | | | | | Protects against overreads in input buffer. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | 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>
* | txd: remove duplicated header inclusionPaul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702': swscale: Do not make ff_ symbols globally visible. rtspdec: use av_strlcpy for writing into fixed size buffer g722enc: fix size argument in memset http: use av_strlcpy instead of strcpy() without size checks avfilter: correct memcpy size avfilter_copy_buf_props() lavc: split asv12 encoder/decoder Conflicts: libavcodec/asvdec.c libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g722enc: fix size argument in memsetJanne Grunau2012-10-09
| | | | | | | | Fixes CID700725.
| * lavc: split asv12 encoder/decoderAnton Khirnov2012-10-09
| |
* | Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a': cmdutils_read_file: increment *size after writing the trailing \0 af_resample: unref out_buf when avresample_convert returns 0 af_amix: prevent memory leak on error path vc1dec: prevent memory leak in error path vc1dec: prevent memory leak on av_realloc error af_channelmap: free old extended_data on reallocation avconv: simplify memory allocation in copy_chapters matroskaenc: check cue point validity before reallocation swfenc: error out for more than 1 audio or video stream build: link test programs only against static libs Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: prevent memory leak in error pathJanne Grunau2012-10-09
| | | | | | | | Fixes CID732271.
| * vc1dec: prevent memory leak on av_realloc errorJanne Grunau2012-10-09
| |
* | Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adxdec: use planar sample formatJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_thpJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ea_xasJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3Justin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_xaJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3Justin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_4xmJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ima_wavJustin Ruggles2012-10-09
| |
| * adpcmdec: use planar sample format for adpcm_ima_qtJustin Ruggles2012-10-09
| |
| * pcmdec: use planar sample format for pcm_lxfJustin Ruggles2012-10-09
| |
| * mace: use planar sample formatJustin Ruggles2012-10-09
| |
| * atrac1: use planar sample formatJustin Ruggles2012-10-09
| |
| * build: non-x86: Only compile mpegvideo optimizations when necessaryDiego Biurrun2012-10-09
| |
| * avcodec: free extended_data instead address of itJanne Grunau2012-10-09
| | | | | | | | Fixes CID732173.
* | pcx: use meaningful return valuesPaul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | x86/dsputil_mmx: change assert() to av_assert()Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: include os2threads.h in vp8.h if HAVE_OS2THREADS is enabledKO Myung-Hun2012-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check for resync marker based on vop coding type- vop_fcode_forward and ↵Anuj Mittal2012-10-09
| | | | | | | | | | | | vop_fcode_backward L Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check resync marker only when enabled.Anuj Mittal2012-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mingw/cygwin: Stop adding -fno-common to gcc CFLAGS Restructure av_log_missing_feature message rtp: Support packetization/depacketization of opus file: Set the return value type for lseek to int64_t. ppc: fix Altivec build with old compilers build: add LTO support for PGI compiler build: add -Mdse to PGI optimisation flags rtpenc_vp8: Update the packetizer to the latest spec version rtpdec_vp8: Make the depacketizer implement the latest spec draft doc: allow building with old texi2html versions avutil: skip old_pix_fmts.h since it is just a list Conflicts: libavcodec/aacdec.c libavcodec/h264.c libavcodec/ppc/fmtconvert_altivec.c libavcodec/utils.c libavformat/file.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Restructure av_log_missing_feature messageDiego Biurrun2012-10-09
| | | | | | | | | | | | | | | | Some invocations include a verb in the log message, others do not. Yet av_log_missing_feature expects callers to provide a verb. Change the function to include a verb instead and update the callers accordingly. The result is a more natural function API and correct English in the function invocations.
| * ppc: fix Altivec build with old compilersMans Rullgard2012-10-08
| | | | | | | | | | | | | | | | | | The vec_splat() intrinsic requires a constant argument for the element number, and the code relies on the compiler unrolling the loop to provide this. Manually unrolling the loop avoids this reliance and works with all compilers. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Write 32bit palette to Targa files.Carl Eugen Hoyos2012-10-09
| | | | | | | | | | | | | | Current ImageMagick fails to read such files, therefore only write the 32bit palette if the palette actually contains any transparency information.
* | ra144: fix code with ftrapv.Michael Niedermayer2012-10-09
| | | | | | | | | | | | A better solution is welcome! Signed-off-by: Michael Niedermayer <michaelni@gmx.at>