aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/options.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-211-373/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) avconv: free packet in write_frame() when discarding due to frame number limit FATE: use +/- flag option syntax for vp8 emu-edge tests lavf: make av_interleave_packet_per_dts() private. lavf: deprecate av_read_packet(). oggdec: output correct timestamps for Vorbis avconv: pass input stream timestamps to audio encoders lavc: shrink encoded audio packet size after encoding. xa: set correct bit rate xa: do not set bit_rate, block_align, or bits_per_coded_sample xa: fix end-of-file handling xa: fix timestamp calculation bink: fix typo in FFALIGN() argument bink: align plane width to 8 when calculating bundle sizes doc: pass -Idoc texi2html and texi2pod doc: texi2pod: add -I flag movenc: Add a min_frag_duration option rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers libavformat: Set the default for the max_delay option to -1 Generate manpages for AV{Format,Codec}Context AVOptions. doc/avconv: remove entries for AVOptions. ... Conflicts: doc/Makefile doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/Makefile libavcodec/options.c libavcodec/vp8.c libavformat/options.c tests/fate/demux.mak tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move AVFormatContext/AVCodecContext option tables to separate files.Anton Khirnov2012-03-201-368/+3
| | | | | | | | This will allow us to automatically generate manpages for them.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-051-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) cmdutils: use new avcodec_is_decoder/encoder() functions. lavc: make codec_is_decoder/encoder() public. lavc: deprecate AVCodecContext.sub_id. libcdio: add a forgotten AVClass to the private context. swscale: remove "cpu flags" from -sws_flags description. proresenc: give user a possibility to alter some encoding parameters vorbisenc: add output buffer overwrite protection libopencore-amrnbenc: fix end-of-stream handling ra144enc: fix end-of-stream handling nellymoserenc: zero any leftover packet bytes nellymoserenc: use proper MDCT overlap delay qpeg: Use bytestream2 functions to prevent buffer overreads. swscale: make %rep unconditional. vp8: convert simple loopfilter x86 assembly to use named arguments. vp8: convert idct x86 assembly to use named arguments. vp8: convert mc x86 assembly to use named arguments. vp8: convert loopfilter x86 assembly to use cpuflags(). vp8: convert idct/mc x86 assembly to use cpuflags(). swscale: remove now unnecessary hack. x86inc: don't "bake" stack_offset in named arguments. ... Conflicts: cmdutils.c doc/APIchanges libavcodec/mpeg12.c libavcodec/options.c libavcodec/qpeg.c libavcodec/utils.c libavcodec/version.h libavdevice/libcdio.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate AVCodecContext.sub_id.Anton Khirnov2012-03-041-0/+2
| | | | | | | | | | | | | | In most places where it's used, it's as a pointless write-only field. Only rv10 decoder actually reads from it, but it stores some internal version info in it. There is no reason for it to be in a public field.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-011-7/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvorbis: fix use of minrate/maxrate AVOptionsJustin Ruggles2012-02-291-2/+2
| | | | | | | | | | | | - enable the options for audio encoding - properly check for user-set maxrate - use correct calling order in vorbis_encode_setup_managed()
| * mpegvideo_enc: add quantizer_noise_shaping private option.Anton Khirnov2012-02-291-1/+3
| | | | | | | | Deprecate corresponding AVCodecContext field.
| * lavc: deprecate AVCodecContext.inter_threshold.Anton Khirnov2012-02-291-0/+2
| | | | | | | | It's unused.
| * lavc: deprecate AVCodecContext.color_table_id.Anton Khirnov2012-02-291-0/+2
| | | | | | | | | | It's currently only used as temporary storage by the mov demuxer. Make it use a local variable instead.
| * mpegvideo_enc: add chroma/luma_elim_threshold private options.Anton Khirnov2012-02-291-0/+2
| | | | | | | | Deprecate corresponding AVCodecContext fields.
| * mpegvideo_enc: add cbp_rd flag to mpv_flags.Anton Khirnov2012-02-291-1/+1
| | | | | | | | Deprecate CODEC_FLAG_CBP_RD.
| * mpegvideo_enc: add qp_rd flag to mpv_flags.Anton Khirnov2012-02-291-1/+3
| | | | | | | | Deprecate CODEC_FLAG_QP_RD.
| * mpegvideo_enc: add strict_gop flag to mpv_flags.Anton Khirnov2012-02-291-1/+3
| | | | | | | | Deprecate CODEC_FLAG2_STRICT_GOP.
| * lavc: add -mpv_flags to mpegvideo_enc-based encoders.Anton Khirnov2012-02-291-1/+3
| | | | | | | | | | Deprecate CODEC_FLAG2_SKIP_RD in favor of the corresponding mpv_flags flag.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Use 4 byte startcodes for H.264 matroskadec: Mark variable as av_unused. Move some conditionally used variables into the block where they are used. Drop some completely unnecessary av_unused attributes. swscale: Remove unused variable alpMmxFilter. Drop unnecessary av_uninit attributes from some variable declarations. movenc: Support muxing wmapro in ismv/isma mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written swscale: move YUV2PACKED16WRAPPER() macro down to where it is used. swscale: handle gray16 as a "planar" YUV format (Y-only, of course). swscale: use yuv2packed1() functions for unscaled chroma also. swscale: fix incorrect chroma bias in yuv2rgb48_1_c(). swscale: fix invalid memory accesses in yuvpacked1() functions. Move PS2 MMI code below the mips subdirectory, where it belongs. mips: Move MMI function declarations to a header. build: Set correct dependencies for rtmp* protocols implemented by librtmp. Conflicts: libavcodec/ac3enc_template.c libavformat/mpegtsenc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move PS2 MMI code below the mips subdirectory, where it belongs.Diego Biurrun2012-02-131-1/+1
| | | | | | | | | | Also give a more suitable name to the MMI-optimized IDCT; it is not PS2-specific, as the name currently suggests.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-091-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Remove Sun medialib glue code.Diego Biurrun2012-02-081-2/+0
| | | | | | | | | | It is obscure, most likely unused and not bit-exact compared to libavcodec due to a different IDCT transform algorithm.
* | Set default qmax for VC-3/DNxHD to 1024 (maximum allowed by VC-3 spec).Joseph Artsimovich2012-02-071-1/+1
| | | | | | | | | | | | Also increase the global limit on qmax. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().Anton Khirnov2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | This way, if the AVCodecContext is allocated for a specific codec, the caller doesn't need to store this codec separately and then pass it again to avcodec_open2(). It also allows to set codec private options using av_opt_set_* before opening the codec.
| * lavc: add avcodec_is_open().Anton Khirnov2012-01-311-1/+1
| | | | | | | | | | | | | | It allows to check whether an AVCodecContext is open in a documented way. Right now the undocumented way this check is done in lavf/lavc is by checking whether AVCodecContext.codec is NULL. However it's desirable to be able to set AVCodecContext.codec before avcodec_open2().
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-122/+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>
| * lavc: remove disabled FF_API_PARSE_FRAME 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_LAME_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-9/+1
| |
| * lavc: remove disabled FF_API_ER cruft.Anton Khirnov2012-01-271-8/+0
| |
| * lavc: remove disabled FF_API_DRC_SCALE cruft.Anton Khirnov2012-01-271-3/+0
| |
| * lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.Anton Khirnov2012-01-271-27/+0
| |
| * lavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-14/+0
| |
| * lavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.Anton Khirnov2012-01-271-7/+0
| |
| * lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-26/+0
| |
| * lavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.Anton Khirnov2012-01-271-50/+1
| |
| * lavc: remove the deprecated "ab" option.Anton Khirnov2012-01-271-1/+0
| |
* | lavc: Mark the err_detect constants as audio+video as they also apply to audio.Michael Niedermayer2012-01-211-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_detection: put the old error detection constants back.Michael Niedermayer2012-01-211-0/+3
| | | | | | | | | | | | | | The old constants are more useful to the end user and have orthogonal meanings to the new ones. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-211-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Use our own SSRC in the SDES field when sending RRs Finalize changelog for 0.8 Release Prepare for 0.8 Release threads: change the default for threads back to 1 threads: update slice_count and slice_offset from user context aviocat: Remove useless includes doc/APIChanges: fill in missing dates and hashes Revert "avserver: fix build after the next bump." mpegaudiodec: switch error detection check to AV_EF_BUFFER lavf: rename fer option and document resulting (f_)err_detect options lavc: rename err_filter option to err_detect and document it mpegvideo: fix invalid memory access for small video dimensions movenc: Reorder entries in the MOVIentry struct, for tigheter packing rtsp: Remove extern declarations for variables that don't exist aviocat: Flush the output before closing Conflicts: Changelog RELEASE libavcodec/mpegaudiodec.c libavcodec/pthread.c libavformat/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * threads: change the default for threads back to 1Janne Grunau2012-01-211-1/+1
| | | | | | | | | | | | Using threaded decoding by default breaks backward compatibility if AVHWAccel is used or if an appliction sets threadunsafe callbacks. Avconv and avplay still use -threads auto if not specified.
| * lavc: rename err_filter option to err_detect and document itDustin Brody2012-01-211-5/+5
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-131-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) utils: Check for extradata size overflows. ARM: rv34: fix asm syntax in dc transform functions avio: Fix the value of the deprecated URL_FLAG_NONBLOCK rv34: fix and optimise frame dependency checking rv34: NEON optimised dc only inverse transform avprobe: use avio_size() instead of deprecated AVFormatContext.file_size. ffmenc: remove references to deprecated AVFormatContext.timestamp. lavf: undeprecate read_seek(). avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY. lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I lavc: ifdef out parse_only AVOption nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT mpegvideo_enc: ifdef out/replace references to deprecated codec flags. riff: remove references to sonic codec ids indeo4: add some missing static and const qualifiers rv34: DC-only inverse transform avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields lavfi: move version macros to a new installed header version.h vsrc_buffer: release the buffer on uninit. rgb2rgb: rgb12tobgr12() ... Conflicts: avconv.c doc/APIchanges ffprobe.c libavfilter/Makefile libavfilter/avfilter.h libswscale/rgb2rgb.c libswscale/rgb2rgb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: ifdef out parse_only AVOptionAnton Khirnov2012-01-121-0/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegenc: use avctx->slices as number of slices v410enc: fix undefined signed left shift caused by integer promotion Release notes: mention cleaned up header includes fix Changelog file Fix a bunch of typos. Drop some pointless void* return value casts from av_malloc() invocations. wavpack: fix typos in previous cosmetic clean-up commit wavpack: cosmetics: K&R pretty-printing avconv: remove the 'codec framerate is different from stream' warning wavpack: determine sample_fmt before requesting a buffer bmv audio: implement new audio decoding API mpegaudiodec: skip all channels when skipping granules mpegenc: simplify muxrate calculation Conflicts: Changelog avconv.c doc/RELEASE_NOTES libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo.c libavformat/mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegenc: use avctx->slices as number of slicesJanne Grunau2012-01-021-1/+1
| | | | | | | | | | | | Adds a new member to MpegEncContext to hold the number of used slice contexts. Fixes segfaults with '-threads 17 -thread_type slice' and fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: add tests for dfa mpegaudiodec: fix seeking. mpegaudiodec: fix compilation when testing the unchecked bitstream reader threads: add sysconf based number of CPUs detection threads: always include necessary headers for number of CPUs detection threads: default to automatic thread count detection Changelog: restore version <next> header cook: K&R formatting cosmetics Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * threads: default to automatic thread count detectionJanne Grunau2011-12-311-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-231-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * options: set minimum for "threads" to zeroJanne Grunau2011-12-221-1/+2
| | | | | | | | | | A negative number of threads does not make sense and 0 is used for autodetection. Adds a symbolic name for autodetection.
* | lavc: Add a AVClass for AVFrames.Michael Niedermayer2011-12-051-0/+24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12: raise timecode to codec context.Clément Bœsch2011-11-281-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-201-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Fix stack alignment for SSE avcodec: move some AVCodecContext fields to an internal struct. avcodec: use av_opt_set() instead of deprecated av_set_string3() avcodec: fix some const warnings avcodec: remove pointless AVOption, internal_buffer_count imgutils: Fix illegal read. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>