aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | riff: add SMV2 FourCC for H264Piotr Bandurski2012-11-101-0/+1
| | | | | | | | | | | | | | | | sample: http://samples.mplayerhq.hu/V-codecs/smv2.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add GXVE FourCC for WMV2Piotr Bandurski2012-11-101-0/+1
| | | | | | | | | | | | | | | | sample: http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add "lsvm" FourCC for H263.Piotr Bandurski2012-11-051-0/+1
| |
* | Add an additional AAC TwoCC.Carl Eugen Hoyos2012-10-281-0/+1
| | | | | | | | | | Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx Originally committed to vlc by Jean-Baptiste.
* | riff: support 0xa100 TwoCCPiotr Bandurski2012-10-271-0/+1
| | | | | | | | | | | | | | fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856 (0xa100 = Comverse Infosys Ltd. G723 1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff_has_valid_tags: remove unused variableMichael Niedermayer2012-10-201-2/+1
| | | | | | | | | | Fixes CID739471 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'Michael Niedermayer2012-10-191-79/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1cd432e167b1a80853760c89a33606e2b5f229c2': configure: fix libcdio check rtsp: Allow setting the reordering buffer size via an AVOption rtsp: Vertically align a constant definition rtp: Update the check for distinguishing between RTP and RTCP aac: fix build with hardcoded tables fate: dependencies for screen codec tests riff: Move functions around to be covered by appropriate #ifdefs Conflicts: configure tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Move functions around to be covered by appropriate #ifdefsDiego Biurrun2012-10-181-79/+79
| | | | | | | | This fixes compilation with --disable-muxers.
* | riff: retry reading metadata without padding if it fails withMichael Niedermayer2012-10-181-2/+7
| | | | | | | | | | | | | | Fixes Ticket1821 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: dont discard truncated metadataMichael Niedermayer2012-10-181-6/+2
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'Michael Niedermayer2012-10-171-1/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0bca0283ccded5e32da143a462168ad1988a58fd': riff: do not write empty INFO tags Conflicts: tests/ref/fate/vsynth1-cljr tests/ref/fate/vsynth1-ffvhuff tests/ref/fate/vsynth1-h261 tests/ref/fate/vsynth1-h263 tests/ref/fate/vsynth1-h263-obmc tests/ref/fate/vsynth1-h263p tests/ref/fate/vsynth1-huffyuv tests/ref/fate/vsynth1-jpegls tests/ref/fate/vsynth1-mjpeg tests/ref/fate/vsynth1-mpeg4-adap tests/ref/fate/vsynth1-mpeg4-adv tests/ref/fate/vsynth1-mpeg4-error tests/ref/fate/vsynth1-mpeg4-nr tests/ref/fate/vsynth1-mpeg4-qpel tests/ref/fate/vsynth1-mpeg4-qprd tests/ref/fate/vsynth1-mpeg4-rc tests/ref/fate/vsynth1-mpeg4-thread tests/ref/fate/vsynth1-msmpeg4 tests/ref/fate/vsynth1-msmpeg4v2 tests/ref/fate/vsynth1-rgb tests/ref/fate/vsynth1-wmv1 tests/ref/fate/vsynth1-wmv2 tests/ref/fate/vsynth1-yuv tests/ref/fate/vsynth2-cljr tests/ref/fate/vsynth2-ffvhuff tests/ref/fate/vsynth2-h261 tests/ref/fate/vsynth2-h263 tests/ref/fate/vsynth2-h263-obmc tests/ref/fate/vsynth2-h263p tests/ref/fate/vsynth2-huffyuv tests/ref/fate/vsynth2-jpegls tests/ref/fate/vsynth2-mjpeg tests/ref/fate/vsynth2-mpeg4-adap tests/ref/fate/vsynth2-mpeg4-error tests/ref/fate/vsynth2-mpeg4-nr tests/ref/fate/vsynth2-mpeg4-qpel tests/ref/fate/vsynth2-mpeg4-qprd tests/ref/fate/vsynth2-mpeg4-rc tests/ref/fate/vsynth2-mpeg4-thread tests/ref/fate/vsynth2-msmpeg4 tests/ref/fate/vsynth2-msmpeg4v2 tests/ref/fate/vsynth2-rgb tests/ref/fate/vsynth2-wmv1 tests/ref/fate/vsynth2-wmv2 tests/ref/fate/vsynth2-yuv tests/ref/lavf/avi tests/ref/seek/h261_avi tests/ref/seek/h263_avi tests/ref/seek/h263p_avi tests/ref/seek/lavf_avi tests/ref/seek/mjpeg_avi tests/ref/seek/mpeg4_adap_avi tests/ref/seek/mpeg4_error_avi tests/ref/seek/mpeg4_nr_avi tests/ref/seek/mpeg4_qpel_avi tests/ref/seek/mpeg4_qprd_avi tests/ref/seek/mpeg4_rc_avi tests/ref/seek/mpeg4_thread_avi tests/ref/seek/msmpeg4_avi tests/ref/seek/msmpeg4v2_avi tests/ref/seek/wmv1_avi tests/ref/seek/wmv2_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: do not write empty INFO tagsVictor Vasiliev2012-10-161-1/+19
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'Michael Niedermayer2012-10-171-1/+31
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68': lavf: move RIFF INFO tag writing from avienc to riff avconv: fix disabling auto mappings with -map_metadata Conflicts: ffmpeg_opt.c libavformat/riff.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move RIFF INFO tag writing from avienc to riffVictor Vasiliev2012-10-161-1/+31
| | | | | | | | | | | | It will be useful in the wav muxer. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * riff: Add SVQ3 fourccDerek Buitenhuis2012-09-141-0/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | riff: fix division by zero for G726Michael Niedermayer2012-10-161-1/+1
| | | | | | | | | | Fixes CID717752 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bitmap header lookup: add code commentrogerdpack2012-09-231-1/+4
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: Add SVQ3 fourccDerek Buitenhuis2012-09-141-0/+1
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-311-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MSS1 and MSS2: set final pixel format after common stuff has been initialised MSS2 decoder configure: handle --disable-asm before check_deps x86: Split inline and external assembly #ifdefs configure: x86: Separate inline from standalone assembler capabilities pktdumper: Use a custom define instead of PATH_MAX for buffers pktdumper: Use av_strlcpy instead of strncpy pktdumper: Use sizeof(variable) instead of the direct buffer length Conflicts: Changelog configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/dct-test.c libavcodec/imgconvert.c libavcodec/mss12.c libavcodec/version.h libavfilter/x86/gradfun.c libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MSS2 decoderAlberto Delmás2012-08-311-0/+1
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | riff: fix remuxing of atrac3 in wavPiotr Bandurski2012-08-251-1/+5
| | | | | | | | | | | | The original codec expects 0 as bps or refuses to play the remuxed file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: move AVRn to a seperate decoder.Michael Niedermayer2012-08-201-1/+1
| | | | | | | | | | | | | | The special cases in demuxers and decoders are a mess otherwise (and more would be needed to support it fully) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riffenc: fix aacMichael Niedermayer2012-08-131-0/+2
| | | | | | | | | | | | Fixes Ticket1435 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rename missed CodecID to AVCodecIDMichael Niedermayer2012-08-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-379/+379
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-339/+339
| |
| * Canopus Lossless decoderDerek Buitenhuis2012-08-011-0/+1
| | | | | | | | | | | | At the moment it only does BGR24, but I plan to add the rest after. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Canopus Lossless decoderDerek Buitenhuis2012-08-011-0/+1
| | | | | | | | | | | | At the moment it only does BGR24, but I plan to add the rest after. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | riff: make the G723.1 in wav output compatible with WMP/msacm codecPiotr Bandurski2012-07-251-0/+9
| | | | | | | | | | | | | | | | Attached patch (together with demuxing patch) allows WMP/msacm G723.1 codec decode files encoded by FFmpeg. Tested with both 6400 and 5333 mode Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: fix remuxing of G723_1 in wavPiotr Bandurski2012-07-241-1/+1
| | | | | | | | | | | | | | | | Attached patch fixes remuxing of G723.1 in wav, so the output is playable by WMP. (It's still not enough for encoding - probably some extradata should be added to the output file to make it playable by WMP/win codec) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add G723_1 wav tagPiotr Bandurski2012-07-211-0/+1
| | | | | | | | | | Reveiwed-by: compn <tempn@twmi.rr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add "SM4V" FourCCPiotr Bandurski2012-07-171-0/+1
| | | | | | | | | | Reviewed-by: compn <tempn@twmi.rr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove internal MPlayer FourCC viv1.Carl Eugen Hoyos2012-07-171-1/+0
| | | | | | | | | | Reviewed-by: Derek Buitenhuis Reviewed-by: Paul B Mahol
* | riff: Assign U263 FourCC to CODEC_ID_H263Piotr Bandurski2012-07-151-1/+1
| |
* | riff: add dvis/pdvc FourCCsPiotr Bandurski2012-07-151-0/+2
| | | | | | | | | | | | | | | | samples: http://www.datafilehost.com/download-4b49270d.html Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-131-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: Fix APE tag dependencies MS Expression Encoder Screen decoder libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MS Expression Encoder Screen decoderKostya Shishkov2012-07-131-0/+1
| |
* | add PLV1 fourcc to mpeg4Compn2012-07-131-0/+1
| | | | | | | | works on http://samples.ffmpeg.org/V-codecs/PLV1/york-water-meteor.avi
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Check for the math function rint TechSmith Screen Codec 2 decoder rtsp: Add listen mode rtsp: Make rtsp_open_transport_ctx() non-static rtsp: Move rtsp_read_close rtsp: Parse the mode=receive/record parameter in transport lines Conflicts: Changelog libavcodec/avcodec.h libavcodec/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * TechSmith Screen Codec 2 decoderKostya Shishkov2012-07-111-0/+1
| |
* | riff: add "YUV8" FourCCPiotr Bandurski2012-07-041-0/+1
| | | | | | | | | | | | | | | | | | sample: http://samples.mplayerhq.hu/V-codecs/yuv8/MAILTEST.AVI Reviewed-by: compn <tempn@twmi.rr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-021-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asfdec: read attached pictures. apetag: reindent apetag: export attached covers as video streams. apetag: fix the amount of data read from binary tags. apetag: make sure avio_get_str() doesn't read more than it should. mov: read itunes cover art. snow: remove VLA in mc_block() intfloat: Don't use designated initializers in the public headers snow: remove a VLA. doc: Remind devs to check return values, especially for malloc() et al MS ATC Screen (aka MSS3) decoder vf_yadif: move x86 init code to x86/yadif.c vf_gradfun: move x86 init code to x86/gradfun.c roqvideo: Remove a totally unused dspcontext smacker: remove some unused code dsicin: remove dead assignment aacdec: remove dead assignment rl2: remove dead assignment proresenc: make a variable local to the loop where it is used alsdec: remove dead assignments Conflicts: Changelog doc/developer.texi libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavfilter/gradfun.h libavfilter/x86/gradfun.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MS ATC Screen (aka MSS3) decoderKostya Shishkov2012-07-021-0/+1
| |
* | riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain ↵Hendrik Leppkes2012-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | that data. According to the specification on the MSDN [1], 0 is valid for that particular field, and it should be ignored in that case. [1]: http://msdn.microsoft.com/en-us/library/windows/desktop/dd757714(v=vs.85).aspx Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-201-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * MS Screen 1 decoderKostya Shishkov2012-06-201-0/+1
| |
* | riff: use av_assertMichael Niedermayer2012-06-141-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | riff: add ISMP/timecode tag.Clément Bœsch2012-06-111-1/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-061-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Indeo Audio decoderKostya Shishkov2012-06-051-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-14 08:28:13 +0000