summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: misc consistency, spelling and wording fixes vcr1: drop unnecessary emms_c() calls without MMX code Replace all uses of av_close_input_file() with avformat_close_input(). lavf: add avformat_close_input(). lavf: deprecate av_close_input_stream(). lavf doxy: add some basic demuxing documentation. lavf doxy: add some general lavf information. lavf doxy: add misc utility functions to a group. lavf doxy: add av_guess_codec/format to the encoding group. lavf doxy: add core functions to a doxy group. Add basic libavdevice documentation. lavc: convert error_recognition to err_recognition. avconv: update -map option help text x86: Require 7 registers for the cabac asm x86: bswap: remove test for bswap instruction bswap: make generic implementation more compiler-friendly h264: remove useless cast proresdec: fix decode_slice() prototype Conflicts: configure doc/APIchanges ffprobe.c libavcodec/avcodec.h libavcodec/celp_math.h libavcodec/h264.c libavfilter/src_movie.c libavformat/anm.c libavformat/avformat.h libavformat/version.h libavutil/avstring.h libavutil/bswap.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: misc consistency, spelling and wording fixesDiego Biurrun2011-12-12
| |
| * vcr1: drop unnecessary emms_c() calls without MMX codePaul B Mahol2011-12-12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * lavc: convert error_recognition to err_recognition.Dustin Brody2011-12-12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * x86: Require 7 registers for the cabac asmMartin Storsjö2011-12-12
| | | | | | | | | | | | | | The change in 599b4c6ef didn't turn out to work properly on i386 on OS X, where it broke building with PIC enabled. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: remove useless castMans Rullgard2011-12-12
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * proresdec: fix decode_slice() prototypeMans Rullgard2011-12-12
| | | | | | | | | | | | | | | | Make the function prototype match the argument of AVCodecCntext.execute() and remove the cast hiding this mismatch. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | timecode: rename internal ff_* symbols to avpriv_*.Clément Bœsch2011-12-12
| | | | | | | | | | | | Those functions are shared between libs. Also fix a typo in function names: smtpe → smpte.
* | timecode: add avpriv_timecode_to_string().Clément Bœsch2011-12-12
| |
* | timecode: better input checks in init function.Clément Bœsch2011-12-12
| |
* | cleanup: remove two extraneous semicolons.Clément Bœsch2011-12-12
| |
* | x86: Require 7 registers for the cabac asmMartin Storsjö2011-12-12
| | | | | | | | | | | | | | | | | | | | The change in 599b4c6ef didn't turn out to work properly on i386 on OS X, where it broke building with PIC enabled. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit f1dba9e4988e78738ad9065e4639b82b8355774a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: cabac: replace explicit memory references with "m" operandsMans Rullgard2011-12-11
| | | | | | | | | | | | | | | | This replaces the explicit offset(reg) memory references with "m" operands for the same locations. As a result, one fewer register operand is needed for these inline asm statements. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * wmapro: use av_float2int()Mans Rullgard2011-12-11
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavc: avoid invalid memcpy() in avcodec_default_release_buffer()Mans Rullgard2011-12-11
| | | | | | | | | | | | | | | | | | | | When the buf and last pointers are equal, the FFSWAP() results in an invalid call to memcpy() with same source and destination on some targets. Although assigning a struct to itself is valid C99, gcc does not check for this before calling memcpy(). See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32667 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavu: replace int/float punning functionsMans Rullgard2011-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing functions defined in intfloat_readwrite.[ch] are both slow and incorrect (infinities are not handled). This introduces a new header with fast, inline conversion functions using direct union punning assuming an IEEE-754 system, an assumption already made throughout the code. The one use of Intel/Motorola extended 80-bit format is replaced by simpler code sufficient under the present constraints (positive normal values). The old functions are marked deprecated and retained for compatibility. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove extraneous semicolonsMans Rullgard2011-12-11
| | | | | | | | | | | | These semicolons cause invalid empty top-level declarations. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Fix a bunch of common typos.Diego Biurrun2011-12-11
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) Warn about avserver being broken. avconv: drop code for special handling of avserver streams. rawdec: don't set codec timebase. lavf doxy: add muxing stuff to lavf_encoding group lavf doxy: add demuxing stuff to lavf_decoding group lavf doxy: expand/reword metadata API doxy. lavf doxy: add installed headers to groups. lavf doxy: add avio groups into the lavf_io group. lavf doxy: rename lavf I/O group to lavf_io. lavf doxy: add metadata docs to the main lavf group ttadec: check channel count as read from extradata. Add CLJR encoding and decoding regression tests cljr: remove unused code flacdec: Support for tracks in cuesheet metadata block ptx: fix inverted check for sufficient data flac muxer: fix writing of file header and STREAMINFO header from extradata ptx: emit a warning on insufficient picture data utvideo: add fate tests covering all codec variants doc: update to refer to avconv doc: remove some stale entries from the faq ... Conflicts: Changelog avconv.c doc/avconv.texi doc/faq.texi doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/avcodec.h libavcodec/cljr.c libavformat/avformat.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ttadec: check channel count as read from extradata.Shitiz Garg2011-12-10
| | | | | | | | | | | | | | fixes floating-point exception due to channels being set to 0. fixes Bug 128. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * cljr: remove unused codePaul B Mahol2011-12-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * ptx: fix inverted check for sufficient dataJanne Grunau2011-12-10
| | | | | | | | Fix regression introduced in 2b53e69.
| * ptx: emit a warning on insufficient picture dataJanne Grunau2011-12-10
| | | | | | | | | | | | Return the whole packet as consumed in this case and not the size the packet should have had. Move the insufficient data check into the for condition to fix a ISO C90 error on bigendian.
| * Dxtory capture format decoderKostya Shishkov2011-12-10
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | h264: Fix concealment regression introduced by ↵Michael Niedermayer2011-12-10
| | | | | | | | | | | | | | | | babf4fe01a808327d53977ba319c113a930180b1 Limit the new case to when the decoder is flushed instead of at each idr frame Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: reset prev_poc_msb to the same value everywhere.Michael Niedermayer2011-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: improve "no picture" debug output.Michael Niedermayer2011-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: switch from qatars has_b_frames calculation back to mine.Michael Niedermayer2011-12-10
| | | | | | | | | | | | Their 2nd try does like the first not work at all. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | adpcm: fix division by zero in fate/creative/intro-partial.wav with -s 2 and ↵Michael Niedermayer2011-12-10
| | | | | | | | | | | | | | -r 0.001:1 Bug-Found-by: Shitiz Garg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: 1000l, unbreak ABIMichael Niedermayer2011-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | amvenc: support videos with heights that are not a multiple of 16.Michael Niedermayer2011-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | add missing long_name for amv and dca encoderPaul B Mahol2011-12-10
| | | | | | | | | | Reviewed-by: Carl Eugen Hoyos Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlp: Use correct speaker locations in TrueHD channel layout.Hendrik Leppkes2011-12-10
| | | | | | | | | | | | (cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vb: Add some checks on input buffer related values.Michael Niedermayer2011-12-09
| | | | | | | | | | | | Fixes crash with INTRO_FAIL.VB Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: workaround a bug in some versions of flash playerMichael Niedermayer2011-12-09
| | | | | | | | | | | | Fixes Ticket570 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cljrenc: 2x2 ordered dither support.Michael Niedermayer2011-12-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cljrenc: add AVOption to disable ditherMichael Niedermayer2011-12-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cljrenc: Add dither to avoid the banding artifcats caused by the very lowMichael Niedermayer2011-12-09
| | | | | | | | | | | | number of bits used to represent brightness levels. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cljr: K&R cosmetics cljr: return a more sensible value when encountering invalid headers cljr: drop unnecessary emms_c() calls without MMX code cljr: remove useless casts cljr: group encode/decode parts under single ifdefs cljr: remove stray semicolon cljr: add missing return statement in decode_end() doc: add pulseaudio to the input list avconv: remove unsubstantiated comment shorten: avoid abort() on unknown audio types cljr: add encoder build: merge lists of HTML documentation targets tests/examples: Mark some variables only used within their files as static. tests/tools/examples: Replace direct exit() calls by return. x86 cpuid: set vendor union members separately cljr: release picture at end of decoding rv40: NEON optimised rv40 qpel motion compensation Conflicts: doc/examples/muxing.c libavcodec/cljr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cljr: K&R cosmeticsDiego Biurrun2011-12-08
| |
| * cljr: return a more sensible value when encountering invalid headersDiego Biurrun2011-12-08
| |
| * cljr: drop unnecessary emms_c() calls without MMX codeDiego Biurrun2011-12-08
| |
| * cljr: remove useless castsMans Rullgard2011-12-08
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cljr: group encode/decode parts under single ifdefsMans Rullgard2011-12-08
| | | | | | | | | | | | | | | | This groups the encode/decode parts under single ifdefs and eliminates the encode_init() function as it merely calls common_init(). Also fix whitespace in moved code. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cljr: remove stray semicolonMans Rullgard2011-12-08
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cljr: add missing return statement in decode_end()Paul B Mahol2011-12-08
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * shorten: avoid abort() on unknown audio typesJohn Brooks2011-12-08
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * cljr: add encoderPaul B Mahol2011-12-08
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * tests/examples: Mark some variables only used within their files as static.Diego Biurrun2011-12-08
| |