aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer2011-11-201-6/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/release/0.7: Add a version bump and APIchanges entry for avcodec_open2 and avformat_find_stream_info. lavf: fix multiplication overflow in avformat_find_stream_info() lavf: fix invalid reads in avformat_find_stream_info() lavf: add avformat_find_stream_info() lavc: fix parentheses placement in avcodec_open2(). lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: doc/APIchanges libavcodec/utils.c libavcodec/version.h libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: fix multiplication overflow in avformat_find_stream_info()Mans Rullgard2011-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | Converting to double before the multiplication rather than after avoids an integer overflow in some cases. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 52767d891c665ab1124fe4ce82d99b59673de7d2) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: fix invalid reads in avformat_find_stream_info()Anton Khirnov2011-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit e358f7ee90fec591348ca05dff94ebaf4c1a098b) Conflicts: libavformat/utils.c Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: add avformat_find_stream_info()Anton Khirnov2011-11-191-5/+13
| | | | | | | | | | | | | | | | | | | | | | It supports passing options to codecs. (cherry picked from commit a67c061e0f3b55ffcc96f336fc0998e44b86c8e4) Conflicts: libavformat/utils.c Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: do not set codec_tag for rawvideoMans Rullgard2011-09-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the demuxer did not set a codec_tag, there is none and inventing one makes no sense. This change stops the rawvideo "decoder" over-writing user-supplied pixfmt with one derived from the codec_tag. The pixfmt-codec_tag-pixfmt round-trip is lossy since several pixfmts map to the same codec_tag. This fixes fate-lavf-pixfmt with avfilter disabled. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit bb416bd68ca46b4a3f1901533064d56a6b8ac95e) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * lavf: Fix context pointer in av_open_input_stream when avformat_open_input failsDavid Goldwich2011-09-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 63d64228a7f31d534e3bcae87cbd37f4a0ae2dd6) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: fix segfault in av_open_input_stream()Anton Khirnov2011-09-261-1/+2
| | | | | | | | | | | | | | ic is NULL in case of error. (cherry picked from commit 13551ad1e336573e3732fdeaf25607c47244bb80) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavf: fix signed overflow in avformat_find_stream_info()Mans Rullgard2011-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | On the first iteration through this code, last_dts is always INT64_MIN (AV_NOPTS_VALUE) and the subtraction overflows in an invalid manner. Although the result is only used if the input values are valid, performing the subtraction is still not allowed in a strict environment. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit a31e9f68a426f634e002282885c6c2eb1bfbea44) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/utils: fix overestimation of the rational number density.Michael Niedermayer2011-10-091-1/+1
| | | | | | | | | | | | Fixes Ticket498 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: Avoid using av_malloc(0) in av_dump_formatMartin Storsjö2011-10-011-1/+1
| | | | | | | | | | | | | | | | On OS X, av_malloc(0) returns pointers that cause crashes when freed. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit e81e5e8ad2bb5746df0c343c396019aca165cf66)
* | lavf/utils: only complain about aspect missmatch when the difference is ↵Michael Niedermayer2011-10-011-1/+3
| | | | | | | | | | | | | | "meassureable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e8d8517b160bd2dea1279d19ec0efd83e00c8c6c)
* | avformat_free_context: favor av_freep()Michael Niedermayer2011-10-011-8/+8
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2a93f28a4b6eef8b93046e0b4e3225f2ff1e7324)
* | Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8Michael Niedermayer2011-09-221-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * khirnov/release/0.7: (64 commits) rv34: Check for invalid slice offsets rv34: Fix potential overreads rv34: Avoid NULL dereference on corrupted bitstream rv10: Reject slices that does not have the same type as the first one lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails oggdec: fix out of bound write in the ogg demuxer Fixed size given to init_get_bits(). smacker: fix a few off by 1 errors Check for invalid VLC value in smacker decoder. Check and propagate errors when VLC trees cannot be built in smacker decoder. Fixed off by one packet size allocation in the smacker demuxer. Check for invalid packet size in the smacker demuxer. ape demuxer: fix segfault on memory allocation failure. xan: Add some buffer checks (cherry picked from commit 0872bb23b4bd2d94a8ba91070f706d1bc1c3ced8) Fixed size given to init_get_bits() in xan decoder. (cherry picked from commit 393d5031c6aaaf8c2dda4eb5d676974c349fae85) smacker demuxer: handle possible av_realloc() failure. Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. cljr: init_get_bits size in bits instead of bytes (cherry picked from commit 0c1f5b93d9b97c4cc3684ba91a040e90bfc760d2) indeo2: fail if input buffer too small (cherry picked from commit b7ce4f1d1c3add86ece7ca595ea6c4a10b471055) indeo2: init_get_bits size in bits instead of bytes (cherry picked from commit 68ca330cbd479111db9cb7649d7530ad59f04cc8) ... Conflicts: ffmpeg.c libavdevice/alsa-audio.h libavformat/gxf.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf: Fix context pointer in av_open_input_stream when avformat_open_input failsDavid Goldwich2011-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 63d64228a7f31d534e3bcae87cbd37f4a0ae2dd6) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | lavf: fix segfault in av_open_input_stream()Anton Khirnov2011-09-111-1/+2
| |/ | | | | | | | | | | | | ic is NULL in case of error. (cherry picked from commit 13551ad1e336573e3732fdeaf25607c47244bb80) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libavformat/utils: print ts in the "invalid dts/pts combination" case.Michael Niedermayer2011-09-211-1/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 38670356f990da1efb906232768836d83356855b)
* | Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is setGavin Kinsey2011-09-081-1/+4
| | | | | | | | (cherry picked from commit d64066f6e88c827e33002b2c7740efd62cd5ba7f)
* | Fix memory corruption in case of memory allocation failure in ↵Michael Niedermayer2011-09-071-1/+7
| | | | | | | | | | | | | | | | av_probe_input_buffer() Reported-by: Tanami Ohad Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 941bb552c6e08b40eb7d7842df19285cd650edd0)
* | Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer2011-07-261-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/release/0.7: (65 commits) riff: Add mpgv MPEG-2 fourcc Update Changelog matroskadec: fix integer underflow if header length < probe length. ffmpeg: fix operation with --disable-avfilter vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h build: Create mlib optimization directories during out-of-tree builds. changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc) doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a) matroskadec: matroska_read_seek after after EBML_STOP leads to failure. Update RELEASE file update Changelog mt: proper locking around release_buffer calls. vp8/mt: flush worker thread, not application thread context, on seek. docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue docs: Use proper markup for a literal command line option docs: Don't recommend adding --enable-memalign-hack docs: Remove needless configure options oggdec: prevent heap corruption. oggdec: Abort Ogg header parsing when encountering a data packet. Add LGPL license boilerplate to files lacking it. ... Conflicts: Changelog configure doc/developer.texi libavcodec/libvpxenc.c libavcodec/rawdec.c libavfilter/x86/gradfun.c libavformat/Makefile libavformat/isom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.Anton Khirnov2011-07-031-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> (cherry picked from commit 4f731c4429e1fe66a5c92ff15feb63253a36d8fb) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * lavf: use the correct pointer in av_open_input_stream().Anton Khirnov2011-07-031-1/+2
| | | | | | | | | | | | (cherry picked from commit 5001d6ef4a2b70fe903b1d2e3e64c6ad7cc1cfa6) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | Fix av_open_input_stream with uninitialized context pointer.Reimar Döffinger2011-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | Code would allocate a new context but forget to assign it to the pointer actually passed to avformat_open_input, potentially causing a crash. Even if it was initialized it would cause a memleak. This caused crashes with e.g. mpd, see also http://bugs.gentoo.org/show_bug.cgi?id=373423 Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | dump_metadata: Fix 0xd in metadataMichael Niedermayer2011-06-201-2/+7
| | | | | | | | | | | | Fixed ticket245 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-191-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: prevent crash in av_open_input_file() if ap == NULL. more Changelog additions lavf: add a forgotten NULL check in convert_format_parameters(). Fix build if yasm is not available. H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions. Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: prevent crash in av_open_input_file() if ap == NULL.Ronald S. Bultje2011-06-181-1/+1
| | | | | | | | Needed for proper behaviour in our old API compatibility code.
| * lavf: add a forgotten NULL check in convert_format_parameters().Anton Khirnov2011-06-181-0/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-181-106/+198
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add avformat_write_header() as a replacement for av_write_header().Anton Khirnov2011-06-161-12/+51
| | | | | | | | It supports more convenient setting of AVOptions.
| * Deprecate av_open_input_* and remove their uses.Anton Khirnov2011-06-161-105/+56
| | | | | | | | Deprecate the last remaining member of AVFormatParameters.
| * lavf: add avformat_open_input() as a replacement for av_open_input_*Anton Khirnov2011-06-161-1/+103
| | | | | | | | Add support for demuxer private options.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-141-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) utils: Drop pointless '#if 1' preprocessor directive. ac3enc: remove empty ac3_float function that is never called ac3enc: split templated float vs. fixed functions into a separate file. ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions. Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications. Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support h264_parser: Fix whitespace after previous change. h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. wav: remove an invalid free(). lavf: initialise reference_dts in av_estimate_timings_from_pts. h264: don't be so picky on decoding pps in extradata. avcodec.h: add or elaborate on some documentation comments. h264: change a few comments into error messages ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). img2: add .dpx to the list of supported file extensions. ffv1: fix undefined behavior with insane widths. ARM: jrevdct_arm: simplify stack usage ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * utils: Drop pointless '#if 1' preprocessor directive.Diego Biurrun2011-06-131-2/+0
| |
| * lavf: initialise reference_dts in av_estimate_timings_from_pts.Michael Niedermayer2011-06-131-0/+1
| | | | | | | | | | | | Fixes issue2437. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-111-32/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: bitstream: Properly promote av_reverse values before shifting. libavutil/swscale: YUV444P10/YUV444P9 support. H.264: Fix high bit depth explicit biweight h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. Update copyright year for ac3enc_opts_template.c. adts: Adjust frame size mask to follow the specification. movenc: Add RTP muxer/hinter options movenc: Pass the RTP AVFormatContext to the SDP generation rtspenc: Add RTP muxer options rtspenc: Add an AVClass for setting muxer specific options rtpenc_chain: Pass the rtpflags options through to the chained muxer rtpenc: Declare the rtp flags private AVOptions in rtpenc.h sdp: Reindent after the previous commit rtpenc: MP4A-LATM payload support avoptions: Add an av_opt_flag_is_set function for inspecting flag fields sdp: Allow passing an AVFormatContext to the SDP generation mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. swscale: split YUYV output out of yuv2packed[12X]_c(). Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/h264dsp_template.c libavcodec/mpeg12.c libavformat/aacdec.c libavformat/avidec.c libavformat/internal.h libavformat/movenc.c libavformat/rtpenc.c libavformat/rtpenc_latm.c libavformat/sdp.c libavformat/version.h libavutil/avutil.h libavutil/pixfmt.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.Diego Biurrun2011-06-101-32/+15
| |
| * lavf: make compute_pkt_fields2() return meaningful error valuesStefano Sabatini2011-06-091-3/+3
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-13/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: don't try to free private options if priv_data is NULL.Anton Khirnov2011-06-081-1/+1
| | | | | | | | | | This might happen if there was an error before priv_data was allocated and result in segfault.
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-081-12/+13
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-061-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove some unused scripts from tools/. Add x86 assembly for some 10-bit H.264 intra predict functions. v4l2: do not force NTSC as standard Skip tableprint.h during 'make checkheaders'. Remove unnecessary LIBAVFORMAT_BUILD #ifdef. Drop explicit filenames from @file Doxygen tags. Skip generated table headers during 'make checkheaders'. lavf,lavc: free avoptions in a generic way. AVOptions: add av_opt_free convenience function. tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS. tiff: print log in case of unknown / unsupported tag. tiff: fix linesize for mono-white/black formats. Fix build of eval-test program configure: Document --enable-vaapi ac3enc: extract all exponents for the frame at once Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf,lavc: free avoptions in a generic way.Anton Khirnov2011-06-051-1/+6
| | | | | | | | | | | | It's simpler and less error-prone. Fixes some memleaks along the way.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mark some variables with av_unusedMans Rullgard2011-06-031-1/+1
| | | | | | | | | | | | | | Most of these variables are only used in av_dlog statements, some are required but not used by other macros. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavf: initialize demuxer private options.Anton Khirnov2011-05-261-0/+4
| |
* | Fix various bad printf format warningsClément Bœsch2011-05-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | muxers: Add a flag to mark muxers that allow (non strict) monotone timestamps.James Zern2011-05-261-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-261-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add fpsprobesize as an AVOption.Alex Converse2011-05-251-0/+2
| |
| * Fix end time of last chapter in compute_chapters_endJohn Stebbins2011-05-251-1/+1
| | | | | | | | | | | | Parenthesis are misplaced in calculation of max_time. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix end time of last chapter in compute_chapters_end().John Stebbins2011-05-251-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 03:47:10 +0000