summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-037-53/+138
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6 ARM: NEON optimised vector_clip_int32() swscale: disable full_chroma_int when converting to non-24/32bpp RGB. suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt() put_bits: remove ALT_BITSTREAM_WRITER put_bits: always use intreadwrite.h macros libavformat: Add an example how to use the metadata API doxygen: Prefer member groups over grouping into modules doxygen: be more permissive when searching for API examples avformat: doxify the Metadata API lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format. lavf: use the correct pointer in av_open_input_stream(). avidec: infer absolute vs relative index from first packet Conflicts: libavformat/Makefile libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Add an example how to use the metadata APIReinhard Tartler2011-07-023-1/+59
| | | | | | | | Also include it into the doxygen documentation
| * doxygen: Prefer member groups over grouping into modulesReinhard Tartler2011-07-022-7/+7
| | | | | | | | | | | | | | | | | | Before this, almost all module groups have been used for grouping functions and fields in structures semantically. This causes them to not appear properly in the file documentation and needlessly clutters up the "Modules" index. Additionally, this commit streamlines some spelling and appearances.
| * avformat: doxify the Metadata APIReinhard Tartler2011-07-021-34/+39
| | | | | | | | | | convert the comment that documents the metadata API to use the doxygen markup
| * lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.Anton Khirnov2011-07-021-1/+6
| | | | | | | | | | | | | | | | | | | | av_open_input_stream used to allow this, even though it makes no sense. Make it just print a warning instead of failing, thus restoring compatibility. Note that avformat_open_input() will still reject this combination. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: use the correct pointer in av_open_input_stream().Anton Khirnov2011-07-021-1/+2
| |
| * avidec: infer absolute vs relative index from first packetAlex Converse2011-07-011-7/+23
| |
* | ALSA demuxer: use av_gettime and a timefilter.Nicolas George2011-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PTS for captured audio was measured using snd_pcm_htimestamp. snd_pcm_htimestamp hangs when the input is a dsnoop plugin. Furthermore, at some point, snd_pcm_htimestamp started returning monotonic timestamps rather than wall clock timestamps, in most but not all situations. Monotonic timestamps are fine, but ffmpeg uses wall clock timestamps everywhere else, and we have no API to inform the user which kind of timestamps it is. A separate snd_pcm_htimestamp is only slightly less accurate than snd_pcm_htimestamp: the standard deviation for the difference between two consecutive timestamps is (on my hardware): - ~13 µs with snd_pcm_htimestamp; - ~35 µs with av_gettime; - ~5 µs with av_gettime and a timefilter.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-022-116/+130
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: get_bits: remove x86 inline asm in A32 bitstream reader doc: Remove outdated information about our issue tracker avidec: Factor out the sync fucntionality. fate-aac: Expand coverage. ac3dsp: add x86-optimized versions of ac3dsp.extract_exponents(). ac3dsp: simplify extract_exponents() now that it does not need to do clipping. ac3enc: clip coefficients after MDCT. ac3enc: add int32_t array clipping function to DSPUtil, including x86 versions. swscale: for >8bit scaling, read in native bit-depth. matroskadec: matroska_read_seek after after EBML_STOP leads to failure. doxygen: fix usage of @file directive in libavutil/{dict,file}.h doxygen: Help doxygen parser to understand the DECLARE_ALIGNED and offsetof macros Conflicts: doc/issue_tracker.txt libavformat/avidec.c libavutil/dict.h libswscale/swscale.c libswscale/utils.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: Factor out the sync fucntionality.Alex Converse2011-07-011-116/+128
| |
| * matroskadec: matroska_read_seek after after EBML_STOP leads to failure.John Stebbins2011-07-011-0/+2
| | | | | | | | | | | | | | | | | | EBML_STOP leaves matroska->current_id set. Then matroska_read_seek changes the stream position without resetting current_id. The next matroska_parse_cluster fails due to calculation of incorrect pos. So clear current_id when avio_seek happens in matroska_read_seek. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | lavf: bump minor and add APIchanges entry for av_get_output_timestampNicolas George2011-07-011-1/+1
| |
* | lavf: add an API to get output timestamps.Nicolas George2011-07-012-0/+30
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-012-15/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: fix some then/than typos doxygen: Include libavcodec and libavformat examples into the documentation avutil: elaborate documentation for av_get_random_seed Add support for aac streams in mp4/mov without extradata. aes: whitespace cosmetics adler32: whitespace cosmetics swscale: fix another yuv range conversion overflow in 16bit scaling. Fix cpu flags test program opt-test: Add missing braces to silence compiler warnings. build: Eliminate obsolete test targets. udp: Fix a compilation warning swscale: Unbreak build with --enable-small base64: add fate test aes: improve test program and add fate test adler32: make test program more useful and add fate test swscale: fix yuv range correction when using 16-bit scaling. aacenc: Make chan_map const correct Conflicts: Makefile doc/examples/muxing-example.c libavformat/udp.c libavutil/random_seed.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Include libavcodec and libavformat examples into the documentationReinhard Tartler2011-06-301-3/+10
| |
| * Add support for aac streams in mp4/mov without extradata.Benjamin Larsson2011-06-301-14/+11
| |
| * udp: Fix a compilation warningMartin Storsjö2011-06-301-1/+1
| | | | | | | | | | | | | | | | | | This fixes this compilation warning, by making endptr a non-const pointer, as required by strtol: In function ‘udp_open’: warning: passing argument 2 of ‘strtol’ from incompatible pointer type Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-303-10/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rational-test: Add proper main() declaration to fix gcc warnings. configure: Add vdpau and dxva2 to configure results output. Remove unused, never built libavutil/pca.[ch] matroskadec: forward parsing errors to caller. av_find_stream_info: simplify EAGAIN handling. aacenc: Fix determination of Mid/Side Mode. psymodel: Remove the single channel analysis function aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel. psymodel: Add channels and channel groups to the psymodel. ARM: remove check for PLD instruction fate: move amr[nw]b test rules into separate files ogg: fix double free when finding length of small chained oggs. swscale: implement >8bit scaling support. build: fix creation of tools dir with make 3.81 build: Mark all-yes Makefile target as phony. pixfmt: fix YUV422/444 wrong endian comment build: create output directories as needed Add new yuv444 pixfmts to avcodec_align_dimensions2 Conflicts: Makefile configure libavutil/pca.c libavutil/pca.h libavutil/pixfmt.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: forward parsing errors to caller.Ami Fischman2011-06-291-5/+6
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * av_find_stream_info: simplify EAGAIN handling.Ami Fischman2011-06-291-4/+4
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ogg: fix double free when finding length of small chained oggs.Ronald S. Bultje2011-06-291-1/+2
| | | | | | | | | | | | | | | | ogg_save() copies streams[], but doesn't keep track of free()'ed struct members. Thus, if in between a call to ogg_save() and ogg_restore(), streams[].private was free()'ed, this would result in a double free -> crash, which happened when e.g. playing small chained ogg fragments.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-292-3/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) swscale: Add Doxygen for hyscale_fast/hScale. fate: enable lavfi-pixmt tests on big endian systems PPC: swscale: disable altivec functions for unsupported formats fate: merge identical pixdesc_be/le tests swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. build: call texi2pod.pl with full path instead of symlink build: include sub-makefiles using full path instead of symlinks swscale: update big endian reference values after dff5a835. wavpack: skip blocks with no samples cosmetics: remove outdated comment that is no longer true build: replace some addprefix/addsuffix with substitution refs avutil: Remove unused arbitrary precision integer code. configure: Drop check for availability of ten assembler operands. aacenc: Save channel configuration for later use. aacenc: Fix codebook trellising for zeroed bands. swscale: change prototypes of scaled YUV output functions. swscale: re-add support for non-native endianness. swscale: disentangle yuv2rgbX_c_full() into small functions. swscale: split yuv2packed[12X]_c() remainders into small functions. swscale: split yuv2packedX_altivec in smaller functions. ... Conflicts: Makefile configure libavcodec/x86/dsputil_mmx.c libavfilter/Makefile libavformat/Makefile libavutil/integer.c libavutil/integer.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: include sub-makefiles using full path instead of symlinksMans Rullgard2011-06-281-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * wavpack: skip blocks with no samplesKostya Shishkov2011-06-281-2/+11
| | | | | | | | | | | | | | These blocks don't report audio stream parameters and they are not needed for decoding. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Support fourcc Y8 (ticket 308).ami_stuff2011-06-271-0/+1
| |
* | Support fourcc YV16 (ticket 307).ami_stuff2011-06-271-0/+1
| |
* | Revert "build: Remove redundant config.mak includes from subdirectory ↵Reimar Döffinger2011-06-261-0/+2
| | | | | | | | | | | | Makefiles." This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-261-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: silence some annoying armcc warnings ffplay: Remove unused-but-set channels variable from update_sample_display(). build: Add DEP_LIBS dependency directly to the shared library build rule. build: Remove multiple inclusion guards from config.mak. build: Remove redundant config.mak includes from subdirectory Makefiles. aacenc: Mark psy_3gpp_window() as av_unused. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Remove redundant config.mak includes from subdirectory Makefiles.Diego Biurrun2011-06-251-2/+0
| | | | | | | | | | Calling Make from subdirectories is not supported and config.mak has multiple inclusion guards anyway, so the top-level include is enough.
* | ogg_read_packet: forward error code.Nicolas George2011-06-251-5/+7
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-251-1/+1
|\ \ | |/ | | | | | | | | | | | | * qatar/master: configure: Add -Wno-format-zero-length to CFLAGS. udp: Receive on the remote port number, if no local port is set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Receive on the remote port number, if no local port is setCan Wu2011-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | For a unicast udp stream to localhost:1234, currently ffplay udp://:1234?localport=1234 works, but ffplay udp://:1234 doesn't work. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-247-66/+58
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Consistently use '@' instead of '\' for Doxygen markup.Diego Biurrun2011-06-244-54/+54
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Use av_printf_format to check the usage of printf style functionsMartin Storsjö2011-06-233-12/+4
| | | | | | | | | | | | | | | | This helps catching cases where the format string doesn't match what is passed in, or injection bugs where user data is passed in as format string. Signed-off-by: Martin Storsjö <martin@martin.st>
| * nsvdec: Propagate error values instead of returning 0 in nsv_read_header().Diego Biurrun2011-06-231-1/+1
| | | | | | | | This eliminates a warning about a set-but-unused variable.
* | Revert needless API change in 05e84c95.Reimar Döffinger2011-06-221-1/+2
| | | | | | | | | | | | | | | | | | When providing a custom AVIOContex for a AVFMT_NOFILE format only print a warning instead of erroring out. This allows the code to work with older MPlayer versions that just always set pb out of laziness. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rawdec: Fix decoding of QT WRAW files. configure: report optimization for size separately mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers. mov: Support R10g codec identifier. riff/img2: Add JPEG 2000 codec IDs. riff: Add DAVC fourcc. riff: Add M263, XVIX, MMJP, CDV5 fourccs. rawvideo: Support auv2 fourcc. swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). h264: Fix assert that failed to compile with -DDEBUG. h264: Add x86 assembly for 10-bit weight/biweight H.264 functions. fate: remove output redirections from old regtest scripts Conflicts: configure libavcodec/rawdec.c libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.Carl Eugen Hoyos2011-06-211-0/+4
| |
| * mov: Support R10g codec identifier.ami_stuff2011-06-211-0/+1
| |
| * riff/img2: Add JPEG 2000 codec IDs.Kamil Nowosad2011-06-212-0/+2
| |
| * riff: Add DAVC fourcc.ami_stuff2011-06-211-0/+1
| | | | | | | | | | This fourcc is used by the "mpegable AVC" codec and files encoded with this codec decode correctly with our H.264 decoder.
| * riff: Add M263, XVIX, MMJP, CDV5 fourccs.Carl Eugen Hoyos2011-06-211-0/+4
| |
| * rawvideo: Support auv2 fourcc.ami_stuff2011-06-211-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-212-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-201-1/+1
| | | | | | | | av_get_bits_per_sample_fmt() is deprecated.
| * mov: Fix empty edit detection.Yusuke Nakamura2011-06-191-1/+1
| |
* | Fix bink audio playback outside of FFmpeg.Ivan Kalvachev2011-06-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 2 known Bink audio codecs. Additionally they have a different flavor if they are found inside Bink-b "BIKb" file. In order to guess the correct flavor, the demuxer sets the audio codec_tag to be the same as the file format tag. This causes problem because same tag is used for both audio codecs. The hack works in FFmpeg because audio codecs are identified by their codec_id, but other players rely on standard behavior. This fix removes the codec_tag hack and instead uses artificial extradata format to signal the codec flavor. This would also allow proper embedding of Bink audio in other containers. Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dump_metadata: Fix 0xd in metadataMichael Niedermayer2011-06-201-2/+7
| | | | | | | | | | | | Fixed ticket245 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: consider non video to contain only keyframes when seeking.Michael Niedermayer2011-06-201-2/+2
| | | | | | | | | | | | Fixes Ticket271 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status