aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* srt: make the demuxer output SubRip packets.Clément Bœsch2012-10-251-0/+11
| | | | | | | | | | | | | | | | | The SRT format should never have outputted CODEC_ID_SRT packets in the first place: SRT is a subtitle format containing SubRip text markup events. The timing information is part of the format, not the codec, and thus CODEC_ID_SRT should not exist. Creating packets with the timing information within the payload only leads to problem (such as remuxing with timing alteration not working), especially when the SubRip markup is being used in container like Matroska in addition to this standalone SRT format. The main reason the timing line was included in those CODEC_ID_SRT packets is likely because it contained extra information (the event position) the codec actually needs. This issue is solved by using the AV_PKT_DATA_SUBTITLE_POSITION side data type.
* lavc: add AV_PKT_DATA_SUBTITLE_POSITION side data type.Clément Bœsch2012-10-242-1/+12
| | | | | | | This commit introduces a new packet side data type for the subtitle position information. This is meant to be used by the SRT format where that information is stored along with the timing, which is not part of the subrip packets.
* lavc/utils: make sub decode consistent with A/V.Clément Bœsch2012-10-241-3/+20
| | | | This allows side data to be transmitted properly with subtitles.
* pgmyuvenc: do not create files which are not supportedPaul B Mahol2012-10-241-2/+2
| | | | | | | It is possible to support files with odd width and/or height if real width and height are stored in header. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-241-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asfdec: cosmetics, reformat ff_asf_parse_packet() g.723.1: add missing CODEC_CAP_DR1 avconv: remove now unneeded calls to avcodec_get_frame_defaults(). lavc: initialize output AVFrame before decoding. Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g.723.1: add missing CODEC_CAP_DR1Anton Khirnov2012-10-241-1/+1
| |
| * lavc: initialize output AVFrame before decoding.Anton Khirnov2012-10-241-0/+4
| | | | | | | | | | | | | | Avoids memleaks with audio when extended_data is nontrivial and the user doesn't reset the frame. Shouldn't have any effect for video for now, but might be useful in the future.
* | Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'Michael Niedermayer2012-10-246-8/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881': lavc: fix documentation for AVCodecContext.delay atrac3: return an error if extradata_size is not a specific known size lavc: use the correct API version guard macro for avcodec_encode_audio() Move Doxyfile into the doc/ subdirectory doxygen: Build Doxygen documentation in the doc/ subdirectory dfa: use av_memcpy_backptr() where previously impossible av_memcpy_backptr: Drop no longer necessary malloc padding Conflicts: .gitignore libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix documentation for AVCodecContext.delayJustin Ruggles2012-10-231-1/+1
| |
| * atrac3: return an error if extradata_size is not a specific known sizeJustin Ruggles2012-10-231-0/+1
| | | | | | | | Also fixes 3 compiler warnings about using uninitialized variables.
| * lavc: use the correct API version guard macro for avcodec_encode_audio()Justin Ruggles2012-10-231-1/+1
| |
| * dfa: use av_memcpy_backptr() where previously impossibleMans Rullgard2012-10-231-3/+1
| | | | | | | | | | | | | | Since the requirement for output padding has been lifted, we can use av_memcpy_backptr() here as well. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * av_memcpy_backptr: Drop no longer necessary malloc paddingDiego Biurrun2012-10-233-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'Michael Niedermayer2012-10-243-30/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb754d041f5f6327fd9195a5f43575af9516daa': lzo: Use AV_COPY*U macros where appropriate prepare 9_beta2 release dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxU intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addresses dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16 mp3: properly forward mp_decode_frame errors Conflicts: RELEASE libavcodec/mpegaudiodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxUDiego Biurrun2012-10-231-14/+6
| |
| * dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16Diego Biurrun2012-10-231-2/+2
| |
| * mp3: properly forward mp_decode_frame errorsLuca Barbato2012-10-231-14/+18
| | | | | | | | | | The function can return either a parsing error or a memory management error.
| * mp3: exit on parsing error in mp_decode_frameLuca Barbato2012-10-231-0/+3
| | | | | | | | | | | | | | Properly forward mp_decode_layer3 errors, mp_decode_layer1 and mp_decode_layer2 do not return errors. Based on a patch by Michael Niedermayer.
* | Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer2012-10-241-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80521c1997a23e148edf89e11b939ab8646297ca': build: allow targets to specify extra objects to link with executables swscale: avoid pointless use of compound literals libm: add fallbacks for various single-precision functions network: use getservbyport() only if available network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN Include sys/time.h before sys/resource.h Conflicts: Makefile configure libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libm: add fallbacks for various single-precision functionsMans Rullgard2012-10-231-0/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | mpegvideo enc: choose VBV buffer size for mpeg4 when none is specified ↵Michael Niedermayer2012-10-241-0/+14
| | | | | | | | | | | | instead of failing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo enc: choose VBV buffer size for mpeg1/2 when none is specified ↵Michael Niedermayer2012-10-241-0/+12
| | | | | | | | | | | | instead of failing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: fix a few grammar/style nits in log messagesStefano Sabatini2012-10-241-3/+3
| | | | | | | | | | | | In avcodec_open2(), apply consistent casing and avoid "or" conjunction at the beginning of a sentence, in the messages issued in case of experimental codec usage.
* | lavc/utils: propagate or return meaningful error codes in avcodec_open2()Stefano Sabatini2012-10-241-3/+3
| |
* | pnmdec: use more meaningful error codesPaul B Mahol2012-10-231-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'Michael Niedermayer2012-10-231-8/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25': mpegaudiodec: Fix buffer handling on random access mpegaudio: Refactor mp3on4 flush function fate: Add dependencies for audio tests fate: cosmetics: Group idct8x8 test together with all other libavcodec tests fate: More fine-grained dependencies for libavcodec test programs Conflicts: tests/fate/audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudiodec: Fix buffer handling on random accessMichael Niedermayer2012-10-231-0/+1
| |
| * mpegaudio: Refactor mp3on4 flush functionDiego Biurrun2012-10-231-8/+9
| |
* | Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer2012-10-237-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b8899ac3233b4f7af83ded0dc032fad8902d714': fate: Declare avcodec/avformat deps in the respective Makefile snippets fate: Add dependencies for WMA and WavPack tests Improve wording and spelling of av_log_missing_feature messages. lavu: remove disabled FF_API_AV_FIFO_PEEK cruft Conflicts: libavcodec/aacsbr.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Improve wording and spelling of av_log_missing_feature messages.Diego Biurrun2012-10-238-11/+11
| |
* | Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'Michael Niedermayer2012-10-233-31/+11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '468ea9d5b14f92fe61f47f034e67066f65163f5f': Revert "avutil: make some tables visible again" Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility" Conflicts: libavcodec/sqrt_tab.c libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI ↵Anton Khirnov2012-10-233-31/+11
| | | | | | | | | | | | | | | | compatibility" This reverts commit d15c21e5fa3961f10026da1a3080a3aa3cf4cec9. After the major bump this is no longer necessary.
* | Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'Michael Niedermayer2012-10-231-22/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a': lavu: postpone recent deprecations until the next major bump APIchanges: update lavr bump date avconv: only apply presets when we have an encoder. atrac3: replace a calculation with FFALIGN() atrac3: remove unused ATRAC3Context field, sample_rate atrac3: use sizeof(variable) instead of sizeof(type) atrac3: simplify MDCT window calculation Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: replace a calculation with FFALIGN()Justin Ruggles2012-10-221-2/+1
| | | | | | | | | | This allocates 4 bytes less than the previous code if avctx->block_align is a multiple of 4, but the extra 4 bytes is not really needed.
| * atrac3: remove unused ATRAC3Context field, sample_rateJustin Ruggles2012-10-221-4/+0
| |
| * atrac3: use sizeof(variable) instead of sizeof(type)Justin Ruggles2012-10-221-6/+7
| |
| * atrac3: simplify MDCT window calculationJustin Ruggles2012-10-221-10/+7
| |
* | Merge commit '5d1007f74dd496d54b932242004382f44e3b22b4'Michael Niedermayer2012-10-231-46/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d1007f74dd496d54b932242004382f44e3b22b4': atrac3: initialize static tables in AVCodec.init_static_data() atrac3: separate window initialization from IMDCT initialization atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used atrac3: remove unused ATRAC3Context field, bit_rate Conflicts: libavcodec/atrac3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: initialize static tables in AVCodec.init_static_data()Justin Ruggles2012-10-221-26/+27
| |
| * atrac3: separate window initialization from IMDCT initializationJustin Ruggles2012-10-221-12/+9
| |
| * atrac3: move the 'frame_factor' field from ATRAC3Context to where it is usedJustin Ruggles2012-10-221-7/+6
| |
| * atrac3: remove unused ATRAC3Context field, bit_rateJustin Ruggles2012-10-221-2/+0
| |
* | Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'Michael Niedermayer2012-10-231-36/+28
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27': atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used atrac3: remove unused ATRAC3Context field, samples_per_channel atrac3: use AVCodecContext.block_align instead of keeping a private copy atrac3: move the 'delay' field from ATRAC3Context to where it is used atrac3: move the 'version' field from ATRAC3Context to where it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is ↵Justin Ruggles2012-10-221-7/+6
| | | | | | | | used
| * atrac3: remove unused ATRAC3Context field, samples_per_channelJustin Ruggles2012-10-221-3/+1
| |
| * atrac3: use AVCodecContext.block_align instead of keeping a private copyJustin Ruggles2012-10-221-17/+13
| |
| * atrac3: move the 'delay' field from ATRAC3Context to where it is usedJustin Ruggles2012-10-221-6/+5
| |
| * atrac3: move the 'version' field from ATRAC3Context to where it is usedJustin Ruggles2012-10-221-5/+5
| |
* | Merge commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45'Michael Niedermayer2012-10-235-658/+624
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5ac673b5531d846b79a3d77e3e932e0cb1234c45': atrac3: use AVCodecContext.channels instead of keeping a private copy atrac3: simplify some loop indexing atrac3: cosmetics: pretty-printing and renaming pcm: define AVCodec instances only for enabled codecs libxvid: remove useless doxy comments. lavc: remove stats_out from the options table. Conflicts: libavcodec/atrac3.c libavcodec/pcm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: use AVCodecContext.channels instead of keeping a private copyJustin Ruggles2012-10-221-21/+20
| |