jv demuxer: prevent video packet size overflow
In the event of overflow, the JV_PADDING state will avio_skip overany overflow bytes (using JVFrame.total_size).
fbdev: fix check on nanosleep return vale
In fbdev_read_packet(): nanosleep returns -1 in case of errors,the EINTR check has to be done on errno.
Spotted by Nicolas.
Signed-off-by: Michael Niedermayer <email@example.com>
jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number
jv demuxer: calculate palette_size for each frame in read_header
Revert "configure: allow checking multiple functions in check_func_headers()"
This reverts commit edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd.
breaks windows builds
Revert "configure: improve pkg-config support"
This reverts commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733.
Revert "configure: use pkg-config helpers"
This reverts commit 4fa18c5666de24316710df670e44d4850e0796a7.
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg
Merged-by: Michael Niedermayer <firstname.lastname@example.org>
VC1: Export profile/level
Signed-off-by: Mans Rullgard <email@example.com>
ffmpeg: remove unused variable in ffmpeg_exit()
Fix the warning:ffmpeg.c: In function ‘ffmpeg_exit’:ffmpeg.c:509: warning: unused variable ‘j’
VP8: optimize VP8Context struct ordering
Shaves at least 3KB off code size on x86, should improve cache utilization.This would probably be useful to do for other decoders/encoders as well.
VP8: fix function declaration
VP8: token probs doesn't need padding
prob0 is the only prob array ever accessed, so prob1 can serve as paddingfor prob0.
VP8: use a goto to break out of two loops
A break statement was supposed to break out of two loops, but only broke out of one.Didn't affect output, just could have been marginally slower.
Add CONFIG_AC3DSP symbol to simplify makefiles
configure: use pkg-config helpers
This makes existing pkg-config uses as well as the libsdl checksuse the new pkg-config helper functions, which should be morerobust against broken systems.
configure: improve pkg-config support
This adds helper functions for checking packages with pkg-configand managing the associated flags.
Note that pkg-config use is still discouraged due to widespreadpoor practices resulting in broken flags in many situations. A...
configure: allow checking multiple functions in check_func_headers()
This makes it possible to pass a space-separated list of functionsto check_func_headers and check_lib2. If any function is missing,none are enabled as available, so this should only be used for...
Merge remote-tracking branch 'remotes/newdev/master'
Revert "ac3enc: use MUL64 to multiply fixed-point coefficients"
Author says, this is unneeded.
This reverts commit 67fc32ac6197a7fe265795d0bf60bf704464394e.
Fix av_find_best_stream when providing a wanted stream
In the main loop, stream_number is incremented after checking the stream type,so the search usually will not find the wanted stream.
This patch eliminates the useless stream_number variable and introduces a new...
Fix av_find_best_stream when decoder_ret is given and using a related stream
Yet another fix for the code originally designed for use without related_stream.
Bitmap Brothers JV errata
Bitmap Brothers JV demuxer
Bitmap Brothers JV video decoder
Add one more avc intra fourcc and extend the description
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>
Export profiles from the mpeg2 video decoder
CrystalHD decoder support v7
The Broadcom CrystalHD decoder chips provide hardware videodecoding for a number of video formats. It does so using amemory:memory interface where a compressed bitstream is fedin and decompressed pictures are copied out. As such, it works...
ffplay: Continue if the file was appended to.This is a bit experimental
Fix url_feof() for file appendings.Signed-off-by: Michael Niedermayer <email@example.com>
id3v2: fix typo in error message
Signed-off-by: Mans Rullgard <firstname.lastname@example.org>(cherry picked from commit fb61a7c5343a23d845ab73dd28caf6ec98cd6101)
aacenc: Fix a segfault in search_for_quantizers
This reverts the removal of scoefs from AACEncContext.It resulted in scoefs being a NULL pointer whensearch_for_quantizers() is called.
Do not use AVFMT_FLAG_NONBLOCK for the output file.
Allows to use output device alsa.
ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder
ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset.
This makes channel coupling more accurate, increasing quality for stereocontent. It also simplifies exponent extraction and mantissa quantizationby no longer needing to apply an offset to the exponents....
ac3enc: use MUL64 to multiply fixed-point coefficients
Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".
framebuffer device demuxer
mpegts: add all stream languages into metadata
This is used at least on some older DVB broadcasts for dual-mono audiotracks.
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit 6a7e074eb98c4d45898d7f2920312db6899ee650)
In retry_transfer_wrapper, do not check url_interrupt_cb, causes problemswhen writing and pressing q during encoding. Instead, check url_interrupt_cbat the end.
Note that when a protocol is interrupted by url_interrupt_cb, some data maybe silently discarded: the protocol context is not suitable for anything...
Flag DVB subtitles for the hard hearing appropriately using their component_type id.
This is based on the component_type definition in the DVB SI spec .
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>...
mpegtsenc: handle multiple language tags per stream
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit 435cebd01560691e9322bdb0aa5af5b2bc76c3f8)
reindent.(cherry picked from commit 4e84f994d3c17f6786fbd4f6463a168fbaaaf477)
avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h
also change its prefix to ffio
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7)
avio: deprecate url_fget_max_packet_size
AVIOContext.max_packet_size should be used directly instead.
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit e8bb2e24398ec838d9e49cf115b7e132609a9fb7)
aacenc: remove the data arrays
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit 2790d7a9ffbd51f33e5367a31ace5c44c30401a1)
lavf: document the use of multiple entries in language metadata tag
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit c92562467e8900fc727d03499afb571a9363c20c)
aac_latm_dec: use aac context and aac m4ac
When decoding latm config, use the corresponding aac context and itsm4ac instead of using NULL and a local variable. This fixes decoding ofaudio in MPEG TS from SBTVD (the Brazillian Digital TV Sytem), whenthere is no extradata. This is the case when using the decoder with...
ac3enc: add some assertions(cherry picked from commit 2d9a101a1f5e102d9538de827d9e4a2e8cf17c89)
ac3enc: use av_assert2() instead of assert() to make debugging easier.(cherry picked from commit 7100d63ca5edfc2e11c68201fb70d61a08a020cb)
cosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec().
It only has Altivec functions and is not compiled if Altivec is disabled.(cherry picked from commit d21be5f15bec15933cb6360aa0159961d987f449)
Add audio codec 0x1600 (ADTS AAC)
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit d34ca1cfe3182c1cb185c31e6b1bb64f40de0e92)
avio: avio_ prefix for url_fsize
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
avio: deprecate url_fgetc and remove all it uses
Signed-off-by: Ronald S. Bultje <firstname.lastname@example.org>(cherry picked from commit e51975392d85e72801193123945a35fb5221248f)
avio: deprecate url_fgets
It's not used anywhere and doesn't look ver useful to be public.
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit 655e45e7dfafc494044cc52f8889fc6da75eff6a)
h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.
Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units,this BSF is then unable to allocate an output buffer for themodified stream. Warn that the resulting stream may be unplayable....
Add Apple HTTP Live Streaming protocol handler
Signed-off-by: Luca Barbato <firstname.lastname@example.org>(cherry picked from commit f4f4e12c0d4e86c4900481b7dca94d22e733c14a)
URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME
If this flag is set, the protocol can handle URLs where thescheme is a nested scheme such as applehttp+file: - the protocolcan handle any URL where the first segment of the nested schemebelongs to this protocol....
URLProtocol: Add a flags field
Signed-off-by: Luca Barbato <email@example.com>(cherry picked from commit f3bea9915fdc87c3f5b635fcfe0250a28e2b1a88)
yadif: add parens around macro parameters
This fixes compilation with preprocessors which do not add whitespacearound replaced tokens, resulting in invalid expressions like 1--1.
Do not loop endlessly if id3v2 tag size is negative / too large.
Fixes the sample from issue 2649.
Change filesize to int64_t.
Seek back to old position after reading id3v1 tag.
FFmpeg did not seek back to the original position, but to "0", makingreading a VBR tag impossible.(issue 2645)
avio: deprecate url_feof
AVIOContext.eof_reached should be used directly instead.
lavf: update documentation of AVOutputFormat.flags
Make sure the first q press doesnt f*ck up the protocols and thus written files.Signed-off-by: Michael Niedermayer <firstname.lastname@example.org>
Fix seting of decode_interrupt_cb()Signed-off-by: Michael Niedermayer <email@example.com>
ac3enc: add some assertions
ac3enc: use av_assert2() instead of assert() to make debugging easier.
It only has Altivec functions and is not compiled if Altivec is disabled.
Fix compilation on powerpc with --disable-altivec.
avio: add avio_skip macro
This is a substitute for the url_fskip function that was deprecated bycommit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee. avio_fskip is provided toimprove demuxer code readability. It distinguishes the act of skipping overunknown or irrelevant bytes from the standard avio_seek operation....
Signed-off-by: Luca Barbato <firstname.lastname@example.org>
Revert "lavf: deprecate get_strz() in favor of avio_get_str" This API is simply ridiculous.We of course keep API/ABI compatibility only useage of the worse APIis reverted.
This reverts commit 773947ba76c575abc01ba128206c87440dad40ec.
Make matroska demuxer also set timestamps for RealAudio packets.
Improves seeking in ffplay withhttp://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv
ac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardcoded value.
Currently it is always 4, but this change will allow it to be adjusted whenbandwidth-related features are added such as channel coupling, enhancedchannel coupling, and spectral extension....
ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h(cherry picked from commit b35743ffb46558be3a90c44f24a7de5fa2c15d85)
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <email@example.com>(cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)