summaryrefslogtreecommitdiff
path: root/libavformat/voc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-9/+9
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Move AVCodecTag from riff.h into internal.h.Francesco Lavra2010-05-221-0/+1
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.Carl Eugen Hoyos2009-10-161-1/+1
| | | | Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* voc: add ff_ prefix to some global const dataAurelien Jacobs2008-08-241-2/+2
| | | | Originally committed as revision 14945 to svn://svn.ffmpeg.org/ffmpeg/trunk
* license header consistency cosmeticsDiego Biurrun2007-07-051-1/+1
| | | | Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add codec_id <-> codec_tag tables to AVIn/OutputFormatMichael Niedermayer2007-01-211-1/+1
| | | | Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move common voc muxer and demuxer data to voc.cAurelien Jacobs2006-11-211-0/+36
| | | | Originally committed as revision 7146 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split voc.c into vocdec.c and vocenc.cAurelien Jacobs2006-11-211-274/+0
| | | | Originally committed as revision 7145 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move common stuff from avienc.c and wav.c to new file riff.cMåns Rullgård2006-07-121-1/+1
| | | | Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
* allow individual selection of muxers and demuxersMåns Rullgård2006-07-101-14/+2
| | | | Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
* give AVInput/OutputFormat structs consistent namesMåns Rullgård2006-07-091-4/+4
| | | | Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify the voc demuxer using av_get_bits_per_sample()Aurelien Jacobs2006-07-071-13/+1
| | | | Originally committed as revision 5663 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add Creative 8 bits ADPCM schemes supportAurelien Jacobs2006-02-161-0/+3
| | | | Originally committed as revision 5024 to svn://svn.ffmpeg.org/ffmpeg/trunk
* voc: set bits_per_sample correctly (fix mplayer playback)Aurelien Jacobs2006-02-091-0/+13
| | | | Originally committed as revision 4968 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a Creative VOC (de)muxerAurelien Jacobs2006-02-091-0/+280
Originally committed as revision 4967 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status