aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* lavf: add av_guess_frame_sample_aspect_ratio functionMarton Balint2012-05-143-1/+43
| | | | | | | | | | | | | | | | 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-141-11/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-141-11/+0
| |
* | udp: check for HAVE_PTHREAD_CANCEL instead of HAVE_PTHREADS.Nicolas George2012-05-141-7/+7
| | | | | | | | | | 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-141-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_initial_durations: add some checks to ensure things match up.Michael Niedermayer2012-05-141-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: rewrite first timestamp reading code.Michael Niedermayer2012-05-141-11/+10
| | | | | | | | | | | | | | | | 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-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fix handling of files smaller than 8kbMichael Niedermayer2012-05-141-4/+2
| | | | | | | | | | | | | | 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-131-32/+38
| |
* | lavf/mp3enc: support MPEG-2 and MPEG-2.5 sample rates when writing Xing header.Clément Bœsch2012-05-131-7/+11
| |
* | lavf: extend the avi raw hack to movMichael Niedermayer2012-05-111-2/+5
| | | | | | | | | | | | Fixes ticket1194 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print a matching tag in case of code tag validation failureMichael Niedermayer2012-05-111-3/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: fix 10l typo, wrong streamMichael Niedermayer2012-05-111-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: check max_delay in write_packet_internal().Michael Niedermayer2012-05-111-0/+15
| | | | | | | | | | | | Checking it during PES writing is too late. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: fix delay typeMichael Niedermayer2012-05-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-103-15/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-101-0/+21
| | | | | | | | | | | | 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-101-0/+8
| | | | | | | | player.
| * rtmp: Support 'rtmp_flashver', an option which overrides the version of the ↵Samuel Pitoiset2012-05-101-7/+18
| | | | | | | | Flash plugin.
| * rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target ↵Samuel Pitoiset2012-05-101-6/+12
| | | | | | | | | | | | stream. Signed-off-by: Martin Storsjö <martin@martin.st>
| * sctp: be consistent with socket option levelSean McGovern2012-05-101-1/+1
| | | | | | | | | | | | 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-091-1/+1
| |
* | omadec: Check geob datasize more completelyMichael Niedermayer2012-05-101-1/+3
| | | | | | | | | | | | | | Fixes out of heap array read. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cdg: fix ptsMichael Niedermayer2012-05-101-1/+2
| | | | | | | | | | | | Fixes Ticket1226 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-106-0/+343
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) libxvid: Give more suitable names to libxvid-related files. libxvid: Separate libxvid encoder from libxvid rate control code. jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse(). fate: cosmetics: lowercase some comments fate: Give more consistent names to some RealVideo/RealAudio tests. lavfi: add avfilter_get_audio_buffer_ref_from_arrays(). lavfi: add extended_data to AVFilterBuffer. lavc: check that extended_data is properly set in avcodec_encode_audio2(). lavc: pad last audio frame with silence when needed. samplefmt: add a function for filling a buffer with silence. samplefmt: add a function for copying audio samples. lavr: do not try to copy to uninitialized output audio data. lavr: make avresample_read() with NULL output discard samples. fate: split idroq audio and video into separate tests fate: improve dependencies fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests fate: split some combined tests into separate audio and video tests fate: fix dependencies for probe tests mips: intreadwrite: fix inline asm for gcc 4.8 mips: intreadwrite: remove unnecessary inline asm ... Conflicts: cmdutils.h configure doc/APIchanges doc/filters.texi ffmpeg.c ffplay.c libavcodec/internal.h libavcodec/jpeglsdec.c libavcodec/libschroedingerdec.c libavcodec/libxvid.c libavcodec/libxvid_rc.c libavcodec/utils.c libavcodec/version.h libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.h tests/Makefile tests/fate/aac.mak tests/fate/audio.mak tests/fate/demux.mak tests/fate/ea.mak tests/fate/image.mak tests/fate/libavutil.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/qt.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/vqf.mak tests/ref/fate/ea-mad tests/ref/fate/ea-tqi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sctp: Initial tcp-alike sctp support with streamsLuca Barbato2012-05-083-0/+330
| | | | | | | | | | Signed-off-by: Jordi Ortiz <nenjordi@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * options_table: Add some missing #includes to fix "make checkheaders".Alex Converse2012-05-081-0/+5
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * rtsp: Add content-type message header parsingJordi Ortiz2012-05-082-0/+8
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-085-13/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream. av_samples_fill_array: Mark unmodified function argument as const. lagarith: add YUY2 decoding support Support decoding unaligned rgb24 lagarith. dv: Split profile handling code into a separate file. flvenc: use AVFormatContext, not AVCodecContext for logging. mov: Remove write-only variable in mov_read_chan(). fate: Change the probe-format refs to match the final text format committed. fate: Add avprobe as a make dependency Add probe fate tests to test for regressions in detecting media types. fate: Add oneline comparison method qdm2: clip array indices returned by qdm2_get_vlc(). avplay: properly close/reopen AVAudioResampleContext on channel layout change avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2() avcodec: for audio encoding, reset output packet when it is not valid avcodec: refactor avcodec_encode_audio2() to merge common branches avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2() Conflicts: ffplay.c libavcodec/Makefile libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/qdm2.c libavcodec/utils.c libavformat/flvenc.c libavformat/mov.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Support 'rtmp_live', an option which specifies if the media is a live ↵Samuel Pitoiset2012-05-081-1/+7
| | | | | | | | | | | | stream. Signed-off-by: Martin Storsjö <martin@martin.st>
| * dv: Split profile handling code into a separate file.Diego Biurrun2012-05-072-0/+2
| |
| * flvenc: use AVFormatContext, not AVCodecContext for logging.Anton Khirnov2012-05-071-10/+11
| | | | | | | | Encoder tag being used for muxer messages is confusing.
| * mov: Remove write-only variable in mov_read_chan().Diego Biurrun2012-05-071-2/+2
| | | | | | | | libavformat/mov.c:597:25: warning: variable ‘cflags’ set but not used
* | yuv4mpeg: support 9/10/16 bit pixel formatsJean First2012-05-081-14/+138
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support yuva422p rawvideo in nut.Carl Eugen Hoyos2012-05-081-0/+1
| |
* | Add Avid Meridien (AVUI) decoder.Carl Eugen Hoyos2012-05-081-1/+1
| |
* | mp3demux: fix id3 discard codeMichael Niedermayer2012-05-081-0/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3demux: fix off by 1 errorMichael Niedermayer2012-05-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: store codecs that dont provide a frame_size as audio_vbr=1Michael Niedermayer2012-05-071-2/+2
| | | | | | | | | | | | Fixes Ticket1240 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-072-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add missing '*' in a doxy.Anton Khirnov2012-05-071-1/+1
| |
| * build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.Diego Biurrun2012-05-071-3/+11
| |
* | mp3enc: avoid ifdefMichael Niedermayer2012-05-071-3/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mp3enc: Fix Xing tag identification string for CBR filesTobias Rapp2012-05-071-2/+23
| | | | | | | | | | | | | | | | Fixes the Xing tag identification string to be "Info" for MP3 files with constant bitrate. The previous "Xing" caused some decoders to recognize the file as VBR. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffm: disable adjust_write_index()Michael Niedermayer2012-05-071-1/+1
| | | | | | | | | | | | | | This code can in its current form not work with ffserver Fixes Ticket1249 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-065-117/+138
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) dfa: use more meaningful return codes eatgv: check vector_bits eatgv: check motion vectors Mark a number of variables only used in av_dlog() calls as av_unused. dvdec: drop const qualifier from variable to eliminate a warning avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation. tests/utils: don't ignore the return value of fwrite() lavfi/formats: use sizeof(var) instead of sizeof(type). lavfi: remove avfilter_default_config_input_link() declaration lavfi: always enable the scale filter and depend on sws. vf_split: support user-specifiable number of outputs. avconv: remove stray useless comment. mpegmux: add stuffing to avoid incomplete PCM frames rtsp: avoid const warnings from strtol() call avserver: check return value of ftruncate() lagarith: make offset array type unsigned dfa: add some checks to ensure that decoder won't write past frame end aacps: NEON optimisations aacps: align some arrays aacps: move some loops to function pointers ... Conflicts: configure doc/filters.texi libavcodec/dfa.c libavcodec/eatgv.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/vf_split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mark a number of variables only used in av_dlog() calls as av_unused.Diego Biurrun2012-05-062-4/+7
| | | | | | | | This fixes a number of unused-but-set gcc warnings.
| * mpegmux: add stuffing to avoid incomplete PCM framesJanne Grunau2012-05-061-0/+6
| | | | | | | | Fixes https://bugzilla.libav.org/show_bug.cgi?id=244
| * rtsp: avoid const warnings from strtol() callMans Rullgard2012-05-061-5/+6
| | | | | | | | | | | | | | | | | | The strtol() interface makes it difficult to use with const-qualified pointers. With this change, although the const is still lost, the compiler does not warn about it. Signed-off-by: Mans Rullgard <mans@mansr.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 10:34:27 +0000