summaryrefslogtreecommitdiff
path: root/libavcodec/version.h
Commit message (Collapse)AuthorAgeFilesLines
* lavc: introduce av_get_pcm_codec.Nicolas George2012-02-221-2/+2
|
* lavc: set bit_rate in the decoder context, just after the init stageStefano Sabatini2012-02-201-1/+1
| | | | | Also move the get_bit_rate() function, in order to avoid an undefined symbol reference in avcodec_open2().
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prores encoderKostya Shishkov2012-02-151-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) CDXL demuxer and decoder hls: Re-add legacy applehttp name to preserve interface compatibility. hlsproto: Rename the functions and context hlsproto: Encourage users to try the hls demuxer instead of the proto doc: Move the hls protocol section into the right place libavformat: Rename the applehttp protocol to hls hls: Rename the functions and context libavformat: Rename the applehttp demuxer to hls rtpdec: Support H263 in RFC 2190 format rv30: check block type validity ttadec: CRC checking movenc: Support muxing VC1 avconv: Don't split out inline sequence headers when stream copying VC1 rv34: handle size changes during frame multithreading rv40: prevent undefined signed overflow in rv40_loop_filter() rv34: use AVERROR return values in ff_rv34_decode_frame() rv34: use uint16_t for RV34DecContext.deblock_coefs librtmp: Add "lib" prefix to librtmp URLProtocol declarations. movenc: Use defines instead of hardcoded numbers for RTCP types smjpegdec: implement seeking ... Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/rv30.c libavcodec/tta.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * CDXL demuxer and decoderPaul B Mahol2012-02-141-1/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-091-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pixdesc: mark pseudopaletted formats with a special flag. avconv: switch to avcodec_encode_video2(). libx264: implement encode2(). libx264: split extradata writing out of encode_nals(). lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacket cmdutils: update copyright year to 2012. swscale: sign-extend integer function argument to qword on x86-64. x86inc: support yasm -f win64 flag also. h264: manually save/restore XMM registers for functions using INIT_MMX. x86inc: allow manual use of WIN64_SPILL_XMM. aacdec: Use correct speaker order for 7.1. aacdec: Remove incorrect comment. aacdec: Simplify output configuration. Remove Sun medialib glue code. dsputil: set STRIDE_ALIGN to 16 for x86 also. pngdsp: swap argument inversion. Conflicts: cmdutils.c configure doc/APIchanges ffmpeg.c libavcodec/aacdec.c libavcodec/dsputil.h libavcodec/libx264.c libavcodec/mlib/dsputil_mlib.c libavcodec/utils.c libavfilter/vf_scale.c libavutil/avutil.h libswscale/mlib/yuv2rgb_mlib.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add avcodec_encode_video2() that encodes from an AVFrame -> AVPacketAnton Khirnov2012-02-081-0/+3
| | | | | | | | Deprecate avcodec_encode_video().
* | Add v408 / AYUV encoder and decoder.Carl Eugen Hoyos2012-02-051-2/+2
| | | | | | | | | | | | Fixes last part of ticket #470. Reviewed-by: Paul B Mahol
* | Add option forced_subs_only for Bluray subtitles.Carl Eugen Hoyos2012-01-301-1/+1
| |
* | Add pix_fmt_info for yuva444.Carl Eugen Hoyos2012-01-301-1/+1
| | | | | | | | Reviewed-by: Paul B Mahol
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-74/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: remove disabled FF_API_AVFRAME_AGE cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_DATA_POINTERS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_PARSE_FRAME cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_GET_ALPHA_INFO cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_AVCODEC_INIT cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_ER cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_DRC_SCALE cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_AVCODEC_OPEN cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_THREAD_INIT cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_PALETTE_CONTROL cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove the deprecated opt.h header.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: increase major version to 54.Anton Khirnov2012-01-271-2/+2
| | | | | | | | | | The lavf-ffm test results change because ffmenc writes AVCodecContext.flags/flags2 and the defaults for those change.
* | r210, r10k and avrp encoderPaul B Mahol2012-01-251-1/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-241-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) aacenc: Fix identification padding when the bitstream is already aligned. aacenc: Write correct length for long identification strings. aud: remove unneeded field, audio_stream_index from context aud: fix time stamp calculation for ADPCM IMA WS aud: simplify header parsing aud: set pts_wrap_bits to 64. cosmetics: indentation aud: support Westwood SND1 audio in AUD files. adpcm_ima_ws: fix stereo decoding avcodec: add a new codec_id for CRYO APC IMA ADPCM. vqa: remove unused context fields, audio_samplerate and audio_bits vqa: clean up audio header parsing vqa: set time base to frame rate as coded in the header. vqa: set packet duration. vqa: use 1/sample_rate as the audio stream time base vqa: set stream start_time to 0. lavc: postpone the removal of AVCodecContext.request_channels. lavf: postpone removing av_close_input_file(). lavc: postpone removing old audio encoding and decoding API avplay: remove the -er option. ... Conflicts: Changelog libavcodec/version.h libavdevice/v4l.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add a new codec_id for CRYO APC IMA ADPCM.Justin Ruggles2012-01-241-1/+1
| | | | | | | | | | The stereo layout and extradata is significantly different from that in Westwood IMA ADPCM, so a separate codec_id is warranted.
| * lavc: postpone the removal of AVCodecContext.request_channels.Anton Khirnov2012-01-241-1/+1
| | | | | | | | | | | | Although it has been deprecated for a long time, its intended replacement (request_channel_layout) is not actually used anywhere, so request_channels is currently the only way to access that functionality.
| * lavc: postpone removing old audio encoding and decoding APIAnton Khirnov2012-01-241-2/+2
| | | | | | | | It has been deprecated only recently.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-241-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove ffmpeg. aacenc: Simplify windowing aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples. aacenc: Deinterleave input samples before processing. aacenc: Store channel count in AACEncContext. aacenc: Move Q^3/4 calculation to it's own table aacenc: Request normalized float samples instead of converting s16 samples to float. aacpsy: Replace an if with FFMAX in LAME windowing. aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons aacenc: cosmetics: move init() and end() to the bottom of the file. aacenc: aac_encode_init() cleanup XWD encoder and decoder vc1: don't read the interpfrm and bfraction elements for interlaced frames mxfdec: fix memleak on mxf_read_close() westwood: split the AUD and VQA demuxers into separate files. Conflicts: .gitignore Changelog Makefile configure doc/ffmpeg.texi ffmpeg.c libavcodec/Makefile libavcodec/aacenc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/img2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * XWD encoder and decoderPaul B Mahol2012-01-231-1/+1
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Support gray8a encoding with libopenjpeg.Carl Eugen Hoyos2012-01-191-1/+1
| | | | | | | | | | Reviewed-by: Michael Bradshaw Reviewed-by: Paul B Mahol
* | Simplify 32bit png decoding.Carl Eugen Hoyos2012-01-191-1/+1
| |
* | Support encoding 16bit pixel formats to sgi.Carl Eugen Hoyos2012-01-191-1/+1
| |
* | Simplify 32bit pam decoding.Carl Eugen Hoyos2012-01-191-1/+1
| | | | | | | | Reviewed-by: Paul B Mahol
* | Simplify targa decoding on big endian.Carl Eugen Hoyos2012-01-191-1/+1
| |
View Lorry Controller Status