aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/au.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Move misplaced file author information where it belongsDiego Biurrun2013-04-111-2/+2
| |
* | Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'Michael Niedermayer2013-03-141-2/+2
|\| | | | | | | | | | | | | | | | | | | * commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e': avformat: av_log_ask_for_sample() ---> avpriv_request_sample() Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun2013-03-131-2/+2
| |
* | auenc: strict check for supported codecPaul B Mahol2013-01-301-1/+9
| | | | | | | | | | | | | | 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>
* | auenc: remove put_au_header() and merge its code into au_write_headerPaul B Mahol2013-01-301-14/+4
| | | | | | | | | | | | Such level of abstraction is pointless. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | au: switch to ff_pcm_read_packet() again, after the mergeMichael Niedermayer2013-01-111-16/+1
| | | | | | | | | | | | | | This fixes G722 durations Suggested-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'Michael Niedermayer2013-01-101-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * au: remove unnecessary castsJustin Ruggles2013-01-091-2/+2
| |
| * au: return AVERROR codes instead of -1Justin Ruggles2013-01-091-5/+6
| |
* | Merge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'Michael Niedermayer2013-01-101-49/+46
|\| | | | | | | | | | | | | | | | | | | * commit 'fd9147f11456a7e39a998d7270684922a2a46e6d': au: cosmetics: pretty-print and remove pointless comments Conflicts: libavformat/au.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * au: cosmetics: pretty-print and remove pointless commentsJustin Ruggles2013-01-091-50/+46
| |
* | Merge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'Michael Niedermayer2013-01-101-1/+18
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * au: use ff_raw_write_packet()Justin Ruggles2013-01-091-8/+3
| |
| * au: set stream start time and packet durationsJustin Ruggles2013-01-091-0/+3
| |
* | Merge commit 'af68a2baae6761044cbed95575e8bcfebf55c6f1'Michael Niedermayer2013-01-101-2/+7
|\| | | | | | | | | | | | | | | * 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>
| * au: use %u when printing id and channels since they are unsignedJustin Ruggles2013-01-091-2/+2
| |
| * au: validate sample rateJustin Ruggles2013-01-091-0/+5
| |
* | Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'Michael Niedermayer2013-01-101-6/+8
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * au: move skipping of unused data to before parameter validationJustin Ruggles2013-01-091-5/+5
| | | | | | | | Also do not unnecessarily skip 0 bytes.
| * au: do not arbitrarily limit channel countJustin Ruggles2013-01-091-3/+3
| | | | | | | | | | Nothing in the AU specification sets a limit on channel count. We only need to avoid an overflow in the packet size calculation.
| * au: do not set pkt->size directlyJustin Ruggles2013-01-091-3/+0
| | | | | | | | It is already set by av_get_packet() even for partial reads.
| * au: set block_align and use it in au_read_packet()Justin Ruggles2013-01-091-3/+3
| |
* | Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114'Michael Niedermayer2013-01-101-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * au: set bit rateJustin Ruggles2013-01-091-0/+1
| |
| * au: validate bits-per-sample separately from codec tagJustin Ruggles2013-01-091-1/+8
| |
* | au: use ff_raw_write_packet()Justin Ruggles2013-01-041-8/+3
| |
* | auenc: do not write invalid file sizePaul B Mahol2012-12-281-4/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'Michael Niedermayer2012-12-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Return proper error code after av_log_ask_for_sample()Diego Biurrun2012-12-231-1/+1
| |
* | au: return meaningful error codesPaul B Mahol2012-12-191-3/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'Michael Niedermayer2012-12-181-59/+59
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * au: Reorder code so that both muxer and demuxer are under #ifdefsDiego Biurrun2012-12-171-63/+63
| | | | | | | | This reduces code size when either piece has been disabled.
* | audec: use ff_pcm_read_packet()Paul B Mahol2012-12-051-21/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | auenc: remove pointless assigmentPaul B Mahol2012-12-041-2/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-291-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles2012-11-281-1/+0
| |
* | Support G.722 in Sun AU.Carl Eugen Hoyos2012-11-241-0/+1
| |
* | Add an annotation field as required by the specification when muxing Sun AU.Carl Eugen Hoyos2012-11-241-2/+5
| | | | | | | | Reviewed-by: Paul B Mahol
* | lavf/au: check bits per coded sample.Nicolas George2012-08-181-1/+4
| | | | | | | | | | | | | | Without that, it would repeatedly produce empty packets if the codec if forced to something invalid. Fix trac ticket #1652.
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-12/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-12/+12
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-311-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Improve descriptiveness of a number of codec and container long namesDiego Biurrun2012-07-301-2/+2
| |
* | Remove some useless code that duplicates av_get_packet.Reimar Döffinger2012-05-011-4/+0
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Mark truncated packets as corrupt in av_get_packet.Reimar Döffinger2012-05-011-0/+1
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: matroska: Clear prev_pkt between seeks. avutil: change default buffer size alignment for sample buffer functions audemux: Add a sanity check for the number of channels Remove libdirac decoder. matroska: Add incremental parsing of clusters. avconv: fix off by one check in complex_filter mpegts: Try seeking back even for nonseekable protocols swscale: K&R formatting cosmetics (part III) Conflicts: configure doc/general.texi doc/platform.texi ffmpeg.c libavcodec/Makefile libavcodec/allcodecs.c libavcodec/libdirac.h libavcodec/libdiracdec.c libavformat/au.c libavformat/mpegts.c libswscale/input.c tests/ref/seek/lavf_mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audemux: Add a sanity check for the number of channelsMichael Niedermayer2012-04-231-0/+5
| | | | | | | | | | | | | | Fixes a division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Martin Storsjö <martin@martin.st>
* | audemux: Fix potential integer overflow leading to a division by 0Michael Niedermayer2012-04-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | audemux: Check channels isnt 0Michael Niedermayer2012-04-221-0/+5
| | | | | | | | | | | | | | Fixes a division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 16:24:52 +0000