Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-18Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'Michael Niedermayer
* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228': lavf: add the notimestamps flag to the muxers missing it Conflicts: libavformat/adtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18lavf: add the notimestamps flag to the muxers missing itAnton Khirnov
2013-10-20avformat/au: add assert to help source code analyzersMichael Niedermayer
See: CID1108585 and CID1108603 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-18avformat: Use G726LE decoder for Sun AU filesCarl Eugen Hoyos
fixes ticket #1955 as suggested by Roman. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Move misplaced file author information where it belongs Conflicts: libavcodec/adpcm.c libavcodec/adpcmenc.c libavcodec/gif.c libavcodec/x86/dsputilenc_mmx.c libavcodec/x86/fmtconvert_init.c libavformat/au.c libavformat/gif.c libavformat/mov.c libavformat/nsvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11Move misplaced file author information where it belongsDiego Biurrun
2013-03-14Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun
2013-01-31auenc: strict check for supported codecPaul B Mahol
Also check number of streams and give error message why muxing failed. This prevents muxing unsupported codec with known and supported tag. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-31auenc: remove put_au_header() and merge its code into au_write_headerPaul B Mahol
Such level of abstraction is pointless. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-11au: switch to ff_pcm_read_packet() again, after the mergeMichael Niedermayer
This fixes G722 durations Suggested-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'Michael Niedermayer
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a': idcinvideo: correctly set AVFrame defaults yadif: Port inline assembly to yasm au: remove unnecessary casts au: return AVERROR codes instead of -1 Conflicts: libavcodec/idcinvideo.c libavfilter/x86/yadif_template.c libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'Michael Niedermayer
* commit 'fd9147f11456a7e39a998d7270684922a2a46e6d': au: cosmetics: pretty-print and remove pointless comments Conflicts: libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'Michael Niedermayer
* commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f': au: use ff_raw_write_packet() au: set stream start time and packet durations Conflicts: libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'af68a2baae6761044cbed95575e8bcfebf55c6f1'Michael Niedermayer
* commit 'af68a2baae6761044cbed95575e8bcfebf55c6f1': au: use %u when printing id and channels since they are unsigned au: validate sample rate Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'Michael Niedermayer
* commit 'c837b38dd33a11c3810e988a60193a858eb4f58c': au: move skipping of unused data to before parameter validation au: do not arbitrarily limit channel count Conflicts: libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'Michael Niedermayer
* commit '9a7b56883d1333cdfcdf0fa7584a333841b86114': au: set bit rate au: validate bits-per-sample separately from codec tag rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT Conflicts: libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-09au: cosmetics: pretty-print and remove pointless commentsJustin Ruggles
2013-01-09au: use ff_raw_write_packet()Justin Ruggles
2013-01-09au: use %u when printing id and channels since they are unsignedJustin Ruggles
2013-01-09au: move skipping of unused data to before parameter validationJustin Ruggles
Also do not unnecessarily skip 0 bytes.
2013-01-09au: remove unnecessary castsJustin Ruggles
2013-01-09au: set stream start time and packet durationsJustin Ruggles
2013-01-09au: validate sample rateJustin Ruggles
2013-01-09au: do not arbitrarily limit channel countJustin Ruggles
Nothing in the AU specification sets a limit on channel count. We only need to avoid an overflow in the packet size calculation.
2013-01-09au: return AVERROR codes instead of -1Justin Ruggles
2013-01-09au: do not set pkt->size directlyJustin Ruggles
It is already set by av_get_packet() even for partial reads.
2013-01-09au: set bit rateJustin Ruggles
2013-01-09au: set block_align and use it in au_read_packet()Justin Ruggles
2013-01-09au: validate bits-per-sample separately from codec tagJustin Ruggles
2013-01-04au: use ff_raw_write_packet()Justin Ruggles
2012-12-28auenc: do not write invalid file sizePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-24Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'Michael Niedermayer
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a': Return proper error code after av_log_ask_for_sample() configure: cosmetics: Separate hwaccel dependencies from decoders/encoders oggdec: check memory allocation Conflicts: configure libavcodec/pictordec.c libavformat/anm.c libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23Return proper error code after av_log_ask_for_sample()Diego Biurrun
2012-12-20au: return meaningful error codesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-18Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'Michael Niedermayer
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a': au: Reorder code so that both muxer and demuxer are under #ifdefs fate: Move RALF test into lossless audio group cosmetics: Use consistent names for multiple inclusion guards. Conflicts: libavformat/au.c tests/fate/lossless-audio.mak tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17au: Reorder code so that both muxer and demuxer are under #ifdefsDiego Biurrun
This reduces code size when either piece has been disabled.
2012-12-05audec: use ff_pcm_read_packet()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-04auenc: remove pointless assigmentPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-29Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer
* commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles
2012-11-24Support G.722 in Sun AU.Carl Eugen Hoyos
2012-11-24Add an annotation field as required by the specification when muxing Sun AU.Carl Eugen Hoyos
Reviewed-by: Paul B Mahol
2012-08-18lavf/au: check bits per coded sample.Nicolas George
Without that, it would repeatedly produce empty packets if the codec if forced to something invalid. Fix trac ticket #1652.
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-08-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30Improve descriptiveness of a number of codec and container long namesDiego Biurrun
2012-05-02Remove some useless code that duplicates av_get_packet.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-05-02Mark truncated packets as corrupt in av_get_packet.Reimar Döffinger
Manually remove that flag again for formats that read an arbitrary amount of data and thus truncation is not an error. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>