summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dwt: K&R prettyprinting cosmetics Remove libnut wrapper fate: change name of FATE samples location environment variable avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. http: Factorize the code by adding http_read_header() Conflicts: configure doc/APIchanges doc/fate.texi libavcodec/dwt.c libavcodec/dwt.h libavformat/Makefile libavformat/avformat.h libavformat/libnut.c libavformat/matroskaenc.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove libnut wrapperDiego Biurrun2012-05-21
| | | | | | | | libnut is unmaintained and known to be buggy; native NUT code exists.
| * avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.James Zern2012-05-20
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * http: Factorize the code by adding http_read_header()Samuel Pitoiset2012-05-20
| | | | | | | | | | | | This function is used for reading http reply headers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | flvdec: reenable extradata passing codeMichael Niedermayer2012-05-21
| | | | | | | | | | | | | | | | | | This fixes passing junk in stream. It should not have any user vissible effect. We are discarding the new data in the decoder as no case is known where it is needed but it causes problems if used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo: Make ivi_calc_band_checksum() static, it is only used in one file. indeo: Drop unused debug function ivi_check_band(). avcodec/utils: cast a function argument to shut up a compiler warning truemotion1: remove disabled code fix typo in comment fate: fix dependencies for non-SAMPLES avconv tests indeo: check for invalid motion vectors indeo: check that band output buffer exists indeo: clear allocated band buffers indeo: track tile macroblock size indeo: check custom Huffman tables for errors factor out common decoding code for Indeo 4 and Indeo 5 mp3: fix start band index for block type 2 in 8kHz audio lavf: change some (de)muxer names to lowercase lavf: make output format matching case insensitive Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: change some (de)muxer names to lowercaseMans Rullgard2012-05-19
| | | | | | | | | | | | This is consistent with other format names. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: make output format matching case insensitiveMans Rullgard2012-05-19
| | | | | | | | | | | | This is consistent with how input formats are matched. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: also use codec aspect ratio in av_guess_sample_aspect_ratioMarton Balint2012-05-20
| | | | | | | | | | | | | | Use codec aspect ratio for frame aspect ratio if AVFrame is NULL. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2: reject APICs with size of 0Piotr Bandurski2012-05-20
| | | | | | | | | | | | fixes ticket #1324 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '755cd4197d53946208e042f095b930dca18d9430'Michael Niedermayer2012-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '755cd4197d53946208e042f095b930dca18d9430': mov: enable parsing for VC-1. lavfi: Add fps filter. lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs. avconv: add support for audio in complex filtergraphs. Conflicts: ffmpeg.c libavfilter/version.h libavformat/mov.c tests/ref/fate/vc1-ism Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: enable parsing for VC-1.Anton Khirnov2012-05-18
| | | | | | | | | | This makes lavf discard broken timestamps for non-B frames in samples/isom/vc1-wmapro.ism.
* | lavf/id3v2: always strdup the value.Clément Bœsch2012-05-19
| | | | | | | | | | | | This simplifies the code but also fix a warning: ff_id3v1_genre_str array contains const strings so do the string dup now instead of in av_dict_set().
* | lavf/id3v2: do not export empty fields.Clément Bœsch2012-05-19
| | | | | | | | This also avoids a memleak.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Replace some @file tags by more suitable markup. fate: Set FUZZ factor of vorbis-13 test to 2. fate: Set FUZZ factor of (e)ac3-encode test to 3. fate: remove unused code from regressions-funcs.sh rtmp: Don't assume path points to a string of nonzero length avconv: fix behavior with -ss as an output option. Conflicts: doc/platform.texi doc/protocols.texi ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Don't assume path points to a string of nonzero lengthMartin Storsjö2012-05-17
| | | | | | | | | | | | | | | | | | If using the new -rtmp_app and -rtmp_playpath parameters, one can in many cases set the main url to just rtmp://server/. If the trailing slash is omitted, path is a string of zero length, and using path+1 will end up reading uninitialized data. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/swf: fix make checkheaders.Clément Bœsch2012-05-18
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Work around non-standard wc implementations at more places fate: work around non-standard wc implementations x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions. ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16 fate: use standard diff options tta: Fix comment about channel number; TTA supports >2 channels. avfilter: Move ff_get_ref_perms_string() to where it is used. build: Add 'check' target to run all compile and test targets. indeo3: validate new frame size before resetting decoder indeo3: when freeing buffers, set pointers referencing them to NULL as well indeo3: initialise pixel planes on allocation indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder fate: rename psx-str-v3-mdec to mdec-v3 fate: convert psx-str to a demuxer test lavf: add mdec to is_intra_only() list Conflicts: doc/developer.texi libavcodec/indeo3.c libavfilter/video.c libavformat/utils.c tests/fate/demux.mak tests/fate/video.mak tests/lavf-regression.sh tests/ref/vsynth1/cljr tests/ref/vsynth1/ffvhuff tests/ref/vsynth2/cljr tests/ref/vsynth2/ffvhuff Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add mdec to is_intra_only() listMans Rullgard2012-05-15
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mtv: do not byteswap raw video in demuxerMans Rullgard2012-05-14
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | aasc: support "Autodesk 24 bit RLE compressor" (FourCC: aas4)Piotr Bandurski2012-05-16
| | | | | | | | | | | | fixes ticket #1310 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add AVFMT_SEEK_TO_PTS to nut demuxer flagsMichael Bradshaw2012-05-16
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Mention AVFMT_SEEK_TO_PTS in AVInputFormat flags docsMichael Bradshaw2012-05-16
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add SLDV FourCC for dvvideo.Piotr Bandurski2012-05-15
| |
* | mtv: make output endian independantMichael Niedermayer2012-05-15
| | | | | | | | | | | | should fix fate-mtv test Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support NTSC forward dvcpro videos (PAL looks incorrect).Carl Eugen Hoyos2012-05-15
| |
* | Read and write APRG mov atom to allow AVUI streamcopy.Carl Eugen Hoyos2012-05-15
| |
* | lavf: add av_guess_frame_sample_aspect_ratio functionMarton Balint2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guesses the sample aspect ratio of a frame, based on both the stream and the frame aspect ratio. Since the frame aspect ratio is set by the codec but the stream aspect ratio is set by the demuxer, these two may not be equal. This function tries to return the value that you should use if you would like to display the frame. Basic logic is to use the stream aspect ratio if it is set to something sane otherwise use the frame aspect ratio. This way a container setting, which is usually easy to modify can override the coded value in the frames. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) vcr1: Add vcr1_ prefixes to all static functions with generic names. vcr1: Fix return type of common_init to match the function pointer signature. vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits. motion-test: remove disabled code gxfenc: remove disabled half-implemented MJPEG tag x86: use more standard construct for setting ASM functions in FFT code fate: westwood-aud: disable decoding fate: caf: disable decoding fate: film-cvid: drop pcm audio and rename test fate: d-cinema-demux: drop unnecessary flags fate: split off dpcm-interplay from interplay-mve tests fate: rename funcom-iss to adpcm-ima-iss fate: rename cryo-apc to adpcm-ima-apc fate: rename adpcm-psx-str-v3 to adpcm-xa fate: split off adpcm-ms-mono test from dxa-feeble fate: split off adpcm-ima-ws test from vqa-cc fate: add adpcm-ima-smjpeg test fate: split off adpcm-ima-amv from amv test fate: separate bmv audio and video tests fate: separate delphine-cin audio and video tests ... Conflicts: doc/platform.texi libavcodec/vcr1.c tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak tests/ref/fate/ea-mad-pcm-planar tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mtv tests/ref/fate/qtrle-1bit tests/ref/fate/qtrle-2bit tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/vqa-cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gxfenc: remove disabled half-implemented MJPEG tagDiego Biurrun2012-05-14
| |
* | udp: check for HAVE_PTHREAD_CANCEL instead of HAVE_PTHREADS.Nicolas George2012-05-14
| | | | | | | | | | Some environments, for example Android, pretend to have pthreads but actually have only a partial implementation.
* | update_initial_durations: use av_ts2str()Michael Niedermayer2012-05-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_initial_durations: add some checks to ensure things match up.Michael Niedermayer2012-05-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: rewrite first timestamp reading code.Michael Niedermayer2012-05-14
| | | | | | | | | | | | | | | | this is simpler and closer to how timestamps are found for seeking. Fixes Ticket1186 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: in ogg_get_length() start from data_offset not 0.Michael Niedermayer2012-05-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fix handling of files smaller than 8kbMichael Niedermayer2012-05-14
| | | | | | | | | | | | | | Fixes Ticket1094 Analyzed-by: mjs973 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: make use of av_ts2str() to print timestamps.Clément Bœsch2012-05-13
| |
* | lavf/mp3enc: support MPEG-2 and MPEG-2.5 sample rates when writing Xing header.Clément Bœsch2012-05-13
| |
* | lavf: extend the avi raw hack to movMichael Niedermayer2012-05-11
| | | | | | | | | | | | Fixes ticket1194 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print a matching tag in case of code tag validation failureMichael Niedermayer2012-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: fix 10l typo, wrong streamMichael Niedermayer2012-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: check max_delay in write_packet_internal().Michael Niedermayer2012-05-11
| | | | | | | | | | | | Checking it during PES writing is too late. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: fix delay typeMichael Niedermayer2012-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC ape: Use unsigned integer maths arm: dsputil: fix overreads in put/avg_pixels functions h264: K&R formatting cosmetics for header files (part II/II) h264: K&R formatting cosmetics for header files (part I/II) rtmp: Implement check bandwidth notification. rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player. rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin. rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream. cmdutils: Add fallback case to switch in check_stream_specifier(). sctp: be consistent with socket option level configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags. vcr1enc: drop pointless empty encode_init() wrapper function vcr1: drop pointless write-only AVCodecContext member from VCR1Context vcr1: group encoder code together to save #ifdefs vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments mov: make one comment slightly more specific lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX lavfi: move audio-related functions to a separate file. lavfi: remove some audio-related function from public API. ... Conflicts: cmdutils.c libavcodec/h264.h libavcodec/h264_mvpred.h libavcodec/vcr1.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavfilter/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Implement check bandwidth notification.Samuel Pitoiset2012-05-10
| | | | | | | | | | | | According to the behaviour of librtmp, it is recommended to send this message to the server after receiving the 'onBWDone' callback in order to do bandwidth checking and improve compatibility with some servers.
| * rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF ↵Samuel Pitoiset2012-05-10
| | | | | | | | player.
| * rtmp: Support 'rtmp_flashver', an option which overrides the version of the ↵Samuel Pitoiset2012-05-10
| | | | | | | | Flash plugin.
| * rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target ↵Samuel Pitoiset2012-05-10
| | | | | | | | | | | | stream. Signed-off-by: Martin Storsjö <martin@martin.st>
| * sctp: be consistent with socket option levelSean McGovern2012-05-10
| | | | | | | | | | | | Replace SOL_SCTP by the more portable IPPROTO_SCTP. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mov: make one comment slightly more specificDiego Biurrun2012-05-09
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 02:45:51 +0000