summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
Commit message (Collapse)AuthorAgeFilesLines
* add forgotten AV_ prefix to some CODEC_IDsPaul B Mahol2012-12-091-5/+5
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Add FourCC V264 for H264 in CCTV recordings.Carl Eugen Hoyos2012-12-021-0/+1
|
* Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'Michael Niedermayer2012-11-291-15/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66': lavf: move nuv fourcc audio tags from riff to nuv lavf: add a common function for selecting a pcm codec from parameters Conflicts: libavformat/internal.h libavformat/mov.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move nuv fourcc audio tags from riff to nuvJustin Ruggles2012-11-281-5/+0
| |
| * lavf: add a common function for selecting a pcm codec from parametersJustin Ruggles2012-11-281-9/+6
| |
* | 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 "MP3 " fourcc from riff to nutJustin Ruggles2012-11-281-1/+0
| | | | | | | | Original commit, 7b24f9b, says it was added because it is used in libnut.
* | Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'Michael Niedermayer2012-11-271-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8': h264: check ref_count validity for num_ref_idx_active_override_flag h264: add missing new line to log message dcadec: skip QMF on unused channels wavenc: write fact chunk sample count at the correct file position riff: do not add empty metadata tags in INFO chunk Conflicts: libavcodec/dcadec.c libavcodec/h264.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: do not add empty metadata tags in INFO chunkJustin Ruggles2012-11-261-0/+6
| |
* | Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'Michael Niedermayer2012-11-271-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9': riff: only warn on a bad INFO chunk code size instead of failing configure: Add separate list for libraries and use where appropriate x86: float_dsp: add SSE version of vector_fmul_scalar() Conflicts: configure libavformat/riff.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: only warn on a bad INFO chunk code size instead of failingJustin Ruggles2012-11-261-4/+5
| | | | | | | | fixes Bug 392
* | Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'Michael Niedermayer2012-11-261-11/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28c8e288fa0342fdef532a7522a4707bebf831cc': x86: h264_chromamc: port to cpuflags yop: fix typo avconv: fix copying per-stream metadata. doc: avtools-common-opts: Fix terminology concerning metric prefixes configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge riff: Make ff_riff_tags static and move under appropriate #ifdef Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Make ff_riff_tags static and move under appropriate #ifdefDiego Biurrun2012-11-251-11/+11
| | | | | | | | The table is not used outside the file.
| * riff: remove a write-only variableAnton Khirnov2012-10-221-2/+1
| |
* | ADPCM IMA Dialogic decoderPaul B Mahol2012-11-241-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | riff: fix decoding of 24-bit packed int (type 1, 20-bit)Piotr Bandurski2012-11-241-1/+2
| |
* | 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
| |
View Lorry Controller Status