summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'Michael Niedermayer2012-10-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72': fate: add a dependency helper macro Add support for building shared libraries with MSVC avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab gxf: Add a local copy of the relevant parts of the frame rate table configure: Split out msvc as a separate target OS aviobuf: Remove a senseless ifdef in avio_seek Conflicts: configure libavcodec/dirac.c libavcodec/mpeg12data.h libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add support for building shared libraries with MSVCMartin Storsjö2012-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires the makedef perl script by Derek, from the c89-to-c99 repo. That scripts produces a .def file, listing the symbols to be exported, based on the gcc version scripts and the built object files. To properly load non-function symbols from DLL files, the data symbol declarations need to have the attribute __declspec(dllimport) when building the calling code. (On mingw, the linker can fix this up automatically, which is why it has not been an issue so far. If this attribute is omitted, linking actually succeeds, but reads from the table will not produce the desired results at runtime.) MSVC seems to manage to link DLLs (and run properly) even if this attribute is present while building the library itself (which normally isn't recommended) - other object files in the same library manage to link to the symbol (with a small warning at link time, like "warning LNK4049: locally defined symbol _avpriv_mpa_bitrate_tab imported" - it doesn't seem to be possible to squelch this warning), and the definition of the tables themselves produce a warning that can be squelched ("warning C4273: 'avpriv_mpa_bitrate_tab' : inconsistent dll linkage, see previous definition of 'avpriv_mpa_bitrate_tab'). In this setup, mingw isn't able to link object files that refer to data symbols with __declspec(dllimport) without those symbols actually being linked via a DLL (linking avcodec.dll ends up with errors like "undefined reference to `__imp__avpriv_mpa_freq_tab'"). The dllimport declspec isn't needed at all in mingw, so we simply choose not to declare it for other compilers than MSVC that requires it. (If ICL support later requires it, the condition can be extended later to include both of them.) This also implies that code that is built to link to a certain library as a DLL can't link to the same library as a static library. Therefore, we only allow building either static or shared but not both at the same time. (That is, static libraries as such can be, and actually are, built - this is used for linking the test tools to internal symbols in the libraries - but e.g. libavformat built to link to libavcodec as a DLL cannot link statically to libavcodec.) Also, linking to DLLs is slightly different from linking to shared libraries on other platforms. DLLs use a thing called import libraries, which is basically a stub library allowing the linker to know which symbols exist in the DLL and what name the DLL will have at runtime. In mingw/gcc, the import library is usually named libfoo.dll.a, which goes next to a static library named libfoo.a. This allows gcc to pick the dynamic one, if available, from the normal -lfoo switches, just as it does for libfoo.a vs libfoo.so on Unix. On MSVC however, you need to literally specify the name of the import library instead of the static library. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tabMartin Storsjö2012-10-18
| | | | | | | | | | | | | | This table doesn't need to be shared with libavformat any longer. Add mpeg12 to the name to make it less ambiguous, while renaming it. Signed-off-by: Martin Storsjö <martin@martin.st>
* | tiffenc: fix integer overflowMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID700699 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | roqvideodec: replace dead code by assertMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID732195 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | roqaudioenc: Fix crash with very small roq filesMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes CID703669 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/tta: do not overwrite bits_per_coded_samplePaul B Mahol2012-10-19
| | | | | | | | | | | | It is supposed to be set in libavformat only. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | kmvc: use meaningful error codesPaul B Mahol2012-10-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | xxan: return more meaningful error codesPaul B Mahol2012-10-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/yop: remove redudant YOP in av_log() messagesPaul B Mahol2012-10-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | jvdec: use more meaningful error codePaul B Mahol2012-10-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | idcinvideo: if decoding fails return errorPaul B Mahol2012-10-19
| | | | | | | | | | | | | | | | | | | | | | | | Previously if frame decoding failed it would be silently reported as valid frame. The fate ref is updated because sample have truncated last video packet. While here return meaningful error codes. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/c93: use meaningful error codesPaul B Mahol2012-10-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | motionpixels/mp_decode_frame_helper: assert that the first pixel doesnt ↵Michael Niedermayer2012-10-19
| | | | | | | | | | | | | | | | | | reuse the last. reusing the last would use uninitialized data, this should be impossible currently, but better to check by assert. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlp_parser: print error when ff_combine_frame() fails to add the current bufferMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes part of CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add raw text subtitles decoder.Clément Bœsch2012-10-18
| |
* | ff_convert_matrix: fix integer overflowMichael Niedermayer2012-10-18
| | | | | | | | | | Fixes CID608053 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideoenc: check return value of ff_MPV_frame_start()Michael Niedermayer2012-10-18
| | | | | | | | | | Fixes CID703622 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lzwenc: change assert to av_assertMichael Niedermayer2012-10-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bmv: remove unreachable default caseMichael Niedermayer2012-10-18
| | | | | | | | | | Fixes CID732191 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo4: prevent printing uninitialized variableMichael Niedermayer2012-10-18
| | | | | | | | | | Fixes CID703822 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dv: change assert(a2 < 4) to av_assert()Michael Niedermayer2012-10-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-18
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros fate: list lavfi tests in a makefile Conflicts: configure tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mips64: mark hi/lo registers clobbered in MAC64/MLS64 macrosMans Rullgard2012-10-17
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'Michael Niedermayer2012-10-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b': fate: dependencies for acodec tests fate: dependencies for vsynth tests fate: add macros useful for conditionally enabling things libmp3lame: resize the output buffer if needed Conflicts: tests/fate/acodec.mak tests/fate/vcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libmp3lame: resize the output buffer if neededJustin Ruggles2012-10-17
| | | | | | | | | | | | | | | | | | The LAME API documentation for the required buffer size refers to the size for a single encode call. However, we store multiple frames in the same output buffer but only read 1 frame at a time out of it. As a result, the buffer size given in lame_encode_buffer() is actually smaller than what it should be. Since we do not know how many frames it will end up buffering, it is best to just reallocate if needed.
* | tiff: run strlen() after setting the pointerMichael Niedermayer2012-10-17
| | | | | | | | | | Fixes CID733803 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | idcinvideo: remove redundant " id CIN Video: " from av_log()Paul B Mahol2012-10-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'Michael Niedermayer2012-10-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a25d912dca9cd553440167e0476c47581359c0fc': avcodec_encode_audio(): fix invalid free pcm-mpeg: correct bitrate calculation ffv1: K&R formatting cosmetics fate: Add rangecoder test network: #include stdint.h in network.h nut: export codec_tag provided by rawvideo avserver: move avserver-specific code from ffmdec.c to avserver.c Conflicts: ffserver.c libavcodec/ffv1.c libavformat/ffmdec.c libavformat/nutenc.c tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec_encode_audio(): fix invalid freeRafaël Carré2012-10-16
| | | | | | | | | | | | | | Since 2bc0de385, AVFrame needs to be initialized before calling avcodec_get_frame_defaults(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * pcm-mpeg: correct bitrate calculationChristian Schmidt2012-10-16
| | | | | | | | | | | | | | | | Bitrate calculation is off since the bluray spec always specifies an even number of coded channels. This was honored in the decoder, but not for bitrate calculation. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * ffv1: K&R formatting cosmeticsLuca Barbato2012-10-16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavc/tta: use meaningful error codesPaul B Mahol2012-10-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffv1: fix packed rgb with 1.3Michael Niedermayer2012-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'Michael Niedermayer2012-10-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b': tiny_psnr: check for specified sample size less than 1 fate: improve md5sum utility selection rangecoder-test: Drop timer output that clutters stderr Conflicts: tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rangecoder-test: Drop timer output that clutters stderrDiego Biurrun2012-10-15
| |
* | Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'Michael Niedermayer2012-10-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d': rangecoder-test: Return in case of an error build: simplify enabling of compat objects Conflicts: configure libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rangecoder-test: Return in case of an errorDiego Biurrun2012-10-15
| |
* | x86/motion_est: widen before multiply.Michael Niedermayer2012-10-16
| | | | | | | | | | This fixes CID700558, CID700557, CID700556 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | msvideo1enc: fix interframe encodingMichael Niedermayer2012-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra288: assert order to be withinn supported range in do_hybrid_window()Michael Niedermayer2012-10-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | msvideo1enc: fix initial keyframe valueMichael Niedermayer2012-10-15
| | | | | | | | | | | | | | keyframe was never set to anything but 1 Fixes CID733730 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dv: Set FS flag from AVFrame.top_field_firstTomas Härdin2012-10-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdec: Set top_field_first from FS flagTomas Härdin2012-10-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdec: Move the VSC pack parsing to before avctx->execute()Tomas Härdin2012-10-15
| | | | | | | | | | | | This allows the next commit to parse the FS flag. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rawdec.c: Extract interlace information from quicktime flag if it exisits.Tim Nicholson2012-10-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: use designated initializers for AVClassPaul B Mahol2012-10-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | xbmenc: cosmetics: reindentPaul B Mahol2012-10-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | flacdec: replace -1 with AV_SAMPLE_FMT_NONEPaul B Mahol2012-10-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | shorten: fix U8 to be planar tooMichael Niedermayer2012-10-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>