summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | ffmpeg: reduce overloading for InputStream.pts.Anton Khirnov2012-02-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | It currently has different meanings at different times (dts of the last read packet/pts of the last decoded frame). Reduce obfuscation by storing pts of the decoded frame in the frame itself. Conflicts: ffmpeg.c Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: update dts variables in transcode_audio()Michael Niedermayer2012-02-081-2/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: move next_dts/pts update out of transcode_video()Michael Niedermayer2012-02-081-16/+18
| | | | | | | | | | | | this makes it placed similar to qatar Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: update ist->pts in transcode_audio with the audio decoders output.Michael Niedermayer2012-02-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: print more details and rescaled timestamps in debug code.Michael Niedermayer2012-02-081-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: use (next_)dts in timestamp discontinuity detection code.Michael Niedermayer2012-02-081-3/+3
| | | | | | | | | | Strongly based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: Use the correct (dts) variables for stream copy.Michael Niedermayer2012-02-081-4/+4
| | | | | | | | | | Strongly based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: Fix (next)_dts/pts init.Michael Niedermayer2012-02-081-1/+2
| | | | | | | | | | Based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: use ist->dts instead of passing an argument into transcode_video().Michael Niedermayer2012-02-081-8/+6
| | | | | | | | | | | | | | This makes the code more similar to qatar And fixes decoding of the last frame of fate/vc1-ism Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: Init dts variables in output_packet()Michael Niedermayer2012-02-081-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: add (next_dts/dts) variables.Michael Niedermayer2012-02-081-0/+6
| | | | | | | | | | Strongly based on Anton Khirnovs code. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-081-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: make yuv2yuv1 use named registers. h264: mark h264_idct_add8_10 with number of XMM registers. swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case. vp8: always update next_framep[] before returning from decode_frame(). avconv: estimate next_dts from framerate if it is set. avconv: better next_dts usage. avconv: rename InputStream.pts to last_dts. avconv: reduce overloading for InputStream.pts. avconv: rename InputStream.next_pts to next_dts. avconv: rework -t handling for encoding. avconv: set encoder timebase for subtitles. pva-demux test: add -vn swscale: K&R formatting cosmetics for SPARC code apedec: allow the user to set the maximum number of output samples per call apedec: do not unnecessarily zero output samples for mono frames apedec: allocate a single flat buffer for decoded samples apedec: use sizeof(field) instead of sizeof(type) swscale: split C output functions into separate file. swscale: Split C input functions into separate file. bytestream: Add bytestream2 writing API. The avconv changes are due to massive regressions and bugs not merged yet. Conflicts: ffmpeg.c libavcodec/vp8.c libswscale/swscale.c libswscale/x86/swscale_template.c tests/fate/demux.mak tests/ref/lavf/asf tests/ref/lavf/avi tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_avi tests/ref/seek/lavf_mkv tests/ref/seek/lavf_rm Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: document the unit for the -fs option parameterStefano Sabatini2012-02-061-1/+1
| |
* | lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspectStefano Sabatini2012-02-061-26/+9
| | | | | | | | Factorize code and provide ratio parsing consistency.
* | ffmpeg: document avi special caseMichael Niedermayer2012-02-051-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-041-14/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix -map_channel being ignored when resampling is not needed.Clément Bœsch2012-01-311-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-311-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) avconv: deprecate the -deinterlace option doc: Fix the name of the new function aacenc: make sure to encode enough frames to cover all input samples. aacenc: only use the number of input samples provided by the user. wmadec: Verify bitstream size makes sense before calling init_get_bits. kmvc: Log into a context at a log level constant. mpeg12: Pad framerate tab to 16 entries. kgv1dec: Increase offsets array size so it is large enough. kmvc: Check palsize. nsvdec: Propagate errors nsvdec: Be more careful with av_malloc(). nsvdec: Fix use of uninitialized streams. movenc: cosmetics: Get rid of camelCase identifiers swscale: more generic check for planar destination formats with alpha doc: Document mov/mp4 fragmentation options build: Use order-only prerequisites for creating FATE reference file dirs. x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf rtsp: Remove some unused variables from ff_rtsp_connect(). avutil: make intfloat api public avformat_write_header(): detail error message ... Conflicts: doc/APIchanges doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/kmvc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_yasm.asm libavcodec/x86/pngdsp-init.c libavformat/movenc.c libavformat/movenc.h libavformat/mpegtsenc.c libavformat/nsvdec.c libavformat/utils.c libavutil/avutil.h libswscale/swscale.c Merged-by: Michael Niedermayer <[email protected]>
* | Fallback to input timestamps for non-delay encoders.Reimar Döffinger2012-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes FFmpeg to pass through the correct pts values, instead of clobbering all to AV_NOPTS_VALUE (the av_init_packet default) to then make up new ones based on only fps when muxing. Included are also the related FATE ref changes, which all some reasonable on quick investigation. Also set all H.264 references to us -vsync drop to reduce the diff for the ref files. Otherwise almost all H.264 references need to change, mostly due to now starting with negative pts values. About 20 additional H.264 conformance tests needed -vsync drop anyway because they create pts values that are out of order and thus not possible to mux otherwise. Signed-off-by: Reimar Döffinger <[email protected]>
* | Add -vsync drop.Reimar Döffinger2012-01-281-1/+5
| | | | | | | | | | | | | | | | | | This allows to work around any non-monotonic time-stamp errors by just discarding all time stamps. This will be necessary to allow H.264 conformance tests to pass after fixing time stamps to be passed through rawenc. Signed-off-by: Reimar Döffinger <[email protected]>
* | Compare video_sync_method against the appropriate defines.Reimar Döffinger2012-01-281-2/+2
| | | | | | | | Signed-off-by: Reimar Döffinger <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-17/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix -qscale X breaking audio codecsMichael Niedermayer2012-01-261-1/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-261-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) wma: Clip WMA1 and WMA2 frame length to 11 bits. movenc: Don't require frame_size to be set for modes other than mov doc: Update APIchanges with info on muxer flushing movenc: Reindent a block tools: Remove some unnecessary #undefs. rv20: prevent calling ff_h263_decode_mba() with unset height/width tools: K&R reformatting cosmetics Ignore generated aviocat and ismindex tools. build: Automatically include architecture-specific library Makefile snippets. indeo5: prevent null pointer dereference on broken files pktdumper: Use usleep instead of sleep cosmetics: Remove some unnecessary block braces. Drop unnecessary prefix from *sink* variable and struct names. Add a tool for creating smooth streaming manifests movdec: Calculate an average bit rate for fragmented streams, too movenc: Write the sample rate instead of time scale in the stsd atom movenc: Add a separate ismv/isma (smooth streaming) muxer movenc: Allow the caller to decide on fragmentation libavformat: Add a flag for muxers that support write_packet(NULL) for flushing movenc: Add support for writing fragmented mov files ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges ffmpeg.c ffplay.c libavfilter/Makefile libavformat/Makefile libavformat/avformat.h libavformat/movenc.c libavformat/movenc.h libavformat/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <[email protected]>
| * Remove ffmpeg.Anton Khirnov2012-01-231-4415/+0
| |
| * cosmetics: Rename ffsink to avsink.Diego Biurrun2012-01-191-3/+3
| |
* | ffmpeg: add image size check to codec_get_buffer()Michael Niedermayer2012-01-251-0/+3
| | | | | | | | | | | | | | Fixes CVE-2011-3935 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: Allocate buffers of the size needed by the decoder.Michael Niedermayer2012-01-241-4/+3
| | | | | | | | | | | | Fixes bug127 Signed-off-by: Michael Niedermayer <[email protected]>
* | git show 2473a45c85dce6872617b33fce396dbbd6347e8e avconv.c | patch ffmpeg.cMichael Niedermayer2012-01-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original commit: commit 2473a45c85dce6872617b33fce396dbbd6347e8e Author: Janne Grunau <[email protected]> Date: Wed Jan 18 10:53:41 2012 +0100 threads: change the default for threads back to 1 Using threaded decoding by default breaks backward compatibility if AVHWAccel is used or if an appliction sets threadunsafe callbacks. Avconv and avplay still use -threads auto if not specified. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: remove unused and commented variable OutputStream.sync_iptsStefano Sabatini2012-01-201-1/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-181-1/+19
|\| | | | | | | | | | | | | | | * qatar/master: tta: cast output data pointer to the correct type avconv: fix -frames for video encoders with delay. Merged-by: Michael Niedermayer <[email protected]>
* | Fix memleak after switch to encode_audio2 API.Reimar Döffinger2012-01-171-1/+5
| | | | | | | | | | | | Obviously the packet allocated by the encoder must be freed somewhere. Signed-off-by: Reimar Döffinger <[email protected]>
* | ffmpeg: check tcgetattr result.Reimar Döffinger2012-01-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes parallel FATE (make fate -j4) failing under valgrind with: Syscall param ioctl(TCSET{S,SW,SF}) points to uninitialised byte(s) at 0x5D98B23: tcsetattr (tcsetattr.c:88) by 0x43D66C: term_init (ffmpeg.c:734) by 0x43CD8D: main (ffmpeg.c:5071) Address 0x7fefffdd0 is on thread 1's stack Uninitialised value was created by a stack allocation at 0x43D5B0: term_init (ffmpeg.c:716) Signed-off-by: Reimar Döffinger <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-171-100/+105
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv34: add NEON rv34_idct_add rv34: 1-pass inter MB reconstruction add SMJPEG muxer avformat: split out common SMJPEG code pictordec: Use bytestream2 functions avconv: use avcodec_encode_audio2() pcmenc: use AVCodec.encode2() avcodec: bump minor version and add APIChanges for the new audio encoding API avcodec: Add avcodec_encode_audio2() as replacement for avcodec_encode_audio() avcodec: add a public function, avcodec_fill_audio_frame(). rv34: Intra 16x16 handling rv34: Inter/intra MB code split Conflicts: Changelog libavcodec/avcodec.h libavcodec/pictordec.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/rv34dsp.asm libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
* | Increase maximum encoding video buffer size.Carl Eugen Hoyos2012-01-141-2/+2
| | | | | | | | libavutil now supports 64bit RGB formats.
* | ffmpeg: fix return value in opt_old2new after e3127db4.Clément Bœsch2012-01-131-1/+2
| |
* | ffmpeg: use av_asprintf() in opt_old2new() and fix a memleak.Clément Bœsch2012-01-131-3/+3
| |
* | ffmpeg: fix parse_option() string memleak.Clément Bœsch2012-01-131-1/+1
| |
* | ffmpeg.c: transcode_video(): do not go through filter network if encoding is ↵Nicolas Noirbent2012-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | not required This fixes a segmentation fault when doing a transcoding and a stream copy of the same input stream at the same time, e.g.: ffmpeg -i in.mkv -c:v mpeg2video transcode.m2v -c copy copy.ts Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: clarify error message in case of bitstream filter opening failureStefano Sabatini2012-01-131-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-131-12/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) utils: Check for extradata size overflows. ARM: rv34: fix asm syntax in dc transform functions avio: Fix the value of the deprecated URL_FLAG_NONBLOCK rv34: fix and optimise frame dependency checking rv34: NEON optimised dc only inverse transform avprobe: use avio_size() instead of deprecated AVFormatContext.file_size. ffmenc: remove references to deprecated AVFormatContext.timestamp. lavf: undeprecate read_seek(). avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY. lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I lavc: ifdef out parse_only AVOption nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT mpegvideo_enc: ifdef out/replace references to deprecated codec flags. riff: remove references to sonic codec ids indeo4: add some missing static and const qualifiers rv34: DC-only inverse transform avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields lavfi: move version macros to a new installed header version.h vsrc_buffer: release the buffer on uninit. rgb2rgb: rgb12tobgr12() ... Conflicts: avconv.c doc/APIchanges ffprobe.c libavfilter/Makefile libavfilter/avfilter.h libswscale/rgb2rgb.c libswscale/rgb2rgb.h Merged-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-111-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) rv34: frame-level multi-threading mpegvideo: claim ownership of referenced pictures aacsbr: prevent out of bounds memcpy(). ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM sierravmd: fix audio pts bethsoftvideo: Use bytestream2 functions to prevent buffer overreads. bmpenc: support for PIX_FMT_RGB444 swscale: fix crash in fast_bilinear code when compiled with -mred-zone. swscale: specify register type. rv34: use get_bits_left() avconv: reinitialize the filtergraph on resolution change. vsrc_buffer: error on changing frame parameters. avconv: fix -copyinkf. fate: Update file checksums after the mov muxer change in a78dbada55d6 movenc: Don't store a nonzero creation time if nothing was set by the caller bmpdec: support for rgb444 with bitfields compression rgb2rgb: allow conversion for <15 bpp doc: fix stray reference to FFmpeg v4l2: use C99 struct initializer v4l2: poll the file descriptor ... Conflicts: avconv.c libavcodec/aacsbr.c libavcodec/bethsoftvideo.c libavcodec/kmvc.c libavdevice/v4l2.c libavfilter/vsrc_buffer.c libswscale/swscale_unscaled.c libswscale/x86/input.asm tests/ref/acodec/alac tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov tests/ref/vsynth1/dnxhd_1080i tests/ref/vsynth1/mpeg4 tests/ref/vsynth1/qtrle tests/ref/vsynth1/svq1 tests/ref/vsynth2/dnxhd_1080i tests/ref/vsynth2/mpeg4 tests/ref/vsynth2/qtrle tests/ref/vsynth2/svq1 Merged-by: Michael Niedermayer <[email protected]>
* | libswresample: introduce int swr_set_compensation() instead of void ↵Marton Balint2012-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | swr_compensate() The new version returns AVERROR(EINVAL) is the specified paramters are invalid, and also creates the resampler if none was used so far. Signed-off-by: Marton Balint <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | cmdutils: make show_usage() use av_log()Stefano Sabatini2012-01-071-3/+3
| | | | | | | | Avoid printing on stdout when show_usage is used in an error message.
* | ffmpeg: Fix segfault with zzufed 4xm file.Oana Stratulat2012-01-071-2/+2
| | | | | | | | | | | | | | Fixes ticket 885 Signed-off-by: Oana Stratulat <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: check if number of input and output channels are valid.Oana Stratulat2012-01-061-2/+8
| | | | | | | | Fix Ticket887.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-051-6/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix compiler warning for uninitialized variablesJean First2012-01-031-3/+3
| | | | | | | | | | Signed-off-by: Jean First <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: use avformat_close_input instead of av_close_input_fileJean First2012-01-031-1/+1
| | | | | | | | | | | | Signed-off-by: Jean First <[email protected]> Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-031-10/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegenc: use avctx->slices as number of slices v410enc: fix undefined signed left shift caused by integer promotion Release notes: mention cleaned up header includes fix Changelog file Fix a bunch of typos. Drop some pointless void* return value casts from av_malloc() invocations. wavpack: fix typos in previous cosmetic clean-up commit wavpack: cosmetics: K&R pretty-printing avconv: remove the 'codec framerate is different from stream' warning wavpack: determine sample_fmt before requesting a buffer bmv audio: implement new audio decoding API mpegaudiodec: skip all channels when skipping granules mpegenc: simplify muxrate calculation Conflicts: Changelog avconv.c doc/RELEASE_NOTES libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo.c libavformat/mpegenc.c Merged-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-22 15:37:03 +0000