aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/g723_1.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'Michael Niedermayer2012-05-301-1/+1
| | | | | | | | | | | | | | | | * commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725': fate: fix acodec/vsynth tests for make 3.81 pcm_mpeg: fix number of consumed bytes to include the header. avfilter: include required header file avfilter.h in video.h x86: Avoid movs on BUTTERFLYPS when in AVX mode x86: use new schema for ASM macros fate: convert codec-regression.sh to makefile rules fate: allow tests to specify unit size for psnr comparison fate: teach videogen/rotozoom to output a single raw video stream http: Add support for reusing the http socket for subsequent requests http: Add support for using persistent connections Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Use more designated initializers.Paul B Mahol2011-12-301-6/+4
| | | | | | | Also remove some pointless NULL/0 assigments. C++ code must be left as it is because named struct initializers are not supported by C++ standard.
* lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().Clément Bœsch2011-12-031-1/+2
|
* Rename remaining url_ftell to avio_tell.Clément Bœsch2011-11-141-1/+1
|
* Rename remaining get_byte to avio_r8.Clément Bœsch2011-11-141-1/+1
|
* Rename remaining get_buffer to avio_read.Clément Bœsch2011-11-141-1/+1
|
* Replace remaining av_new_stream() with avformat_new_stream().Clément Bœsch2011-11-051-1/+1
|
* g723.1: use raw muxerMohamed Naufal2011-10-131-21/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* g723.1 muxerMohamed Naufal2011-10-101-0/+21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* g723_1_demuxer: rco is also a commonly used extension.Michael Niedermayer2011-09-301-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add the G723.1 demuxer and decoderMohamed Naufal Basheer2011-09-291-0/+83