summaryrefslogtreecommitdiff
path: root/libavcodec/libx264.c
Commit message (Collapse)AuthorAge
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * libx264: implement encode2().Anton Khirnov2012-02-08
| |
| * libx264: split extradata writing out of encode_nals().Anton Khirnov2012-02-08
| | | | | | | | This is done in preparation for the following patch.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libx264: fix indentation. vorbis: fix overflows in floor1[] vector and inverse db table index. win64: add a XMM clobber test configure option. movdec: Parse the dvc1 atom ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6 swscale: K&R formatting cosmetics for Blackfin code frwu: lowercase the FRWU codec name movdec: fix dts generation in fragmented files fate: make acodec-ac3_fixed test output raw AC3 APIchanges: add missing commit hashes swscale: implement MMX, SSE2 and AVX functions for RGB32 input. ra144enc: drop pointless "encoder" from .long_name bethsoftvideo: fix palette reading. mpc7: use av_fast_padded_malloc() mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes doc: decoding Forward Uncompressed is supported Fix a typo in the x86 asm version of ff_vector_clip_int32() pcmenc: Do not set avpkt->size. ff_alloc_packet: modify the size of the packet to match the requested size Conflicts: doc/APIchanges libavcodec/libx264.c libavcodec/mpc7.c libavformat/isom.h libswscale/Makefile libswscale/bfin/yuv2rgb_bfin.c tests/ref/fate/bethsoft-vid tests/ref/seek/ac3_ac3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: fix indentation.Anton Khirnov2012-02-02
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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_X264_GLOBAL_OPTS cruft.Anton Khirnov2012-01-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: sgidec: Use bytestream2 functions to prevent buffer overreads. cosmetics: Move static and inline attributes to more standard places. configure: provide libavfilter/version.h header to get_version() swscale: change yuv2yuvX code to use cpuflag(). libx264: Don't leave max_b_frames as -1 if the user didn't set it FATE: convert output to rgba for the targa tests which currently output pal8 fate: add missing reference files for targa tests in 9c2f9b0e2 FATE: enable the 2 remaining targa conformance suite tests targa: add support for rgb555 palette FATE: fix targa tests on big-endian systems Conflicts: libavcodec/sgidec.c libavcodec/targa.c libswscale/x86/output.asm tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: Don't leave max_b_frames as -1 if the user didn't set itMartin Storsjö2012-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | max_b_frames is initialized to -1 for libx264, to allow distinguishing between an explicit user set 0 and a default not touched 0 (see bb73cda2). If max_b_frames is left as -1, this affects dts generation (where expressions like max_b_frames != 0 are used), so make sure it is left at the default 0 after the libx264 init function returns. This avoids unnecessarily producing dts != pts when using profile=baseline. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: make -frames work for all types of streams, not just video. bfi: K&R cosmetics bgmc: K&R cleanup rawdec: Set start_time to 0 for raw audio files. Detect 'yuv2' as rawvideo also in avi. rawdec: propagate pict_type information to the output frame rawdec: Support more QT 1bpp rawvideo files. avconv: free bitstream filters threads: limit the number of automatic threads to MAX_AUTO_THREADS avplay: K&R cleanup fate: use rgb24 as output format for dfa tests threads: set thread_count to 1 when thread support is disabled threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264 Conflicts: ffplay.c libavcodec/avcodec.h libavcodec/pthread.c libavcodec/version.h tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264Janne Grunau2012-01-01
| | | | | | | | | | | | Some external codecs have their own code to determine the best number of threads. This number is not necessary the number of cpu cores. Thread_count will be only 0 if the codec has CODEC_CAP_AUTO_THREADS.
* | cleanup: remove two extraneous semicolons.Clément Bœsch2011-12-12
| |
* | libx264: workaround a bug in some versions of flash playerMichael Niedermayer2011-12-09
| | | | | | | | | | | | Fixes Ticket570 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: Implement rgb24 support through a seperate AVCodec.Michael Niedermayer2011-12-01
| | | | | | | | | | | | | | This avoids people mistakely encoding in a way that many players dont support. Fixes Ticket658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: fix generic boolean supportMichael Niedermayer2011-12-01
| | | | | | | | | | | | Fixes Ticket660 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov2011-10-12
| |
| * libx264: support yuv422/444 output.Anton Khirnov2011-10-12
| |
* | Allow YUV444P and RGB/BGR encoding for libx264.Themaister2011-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vp6: Reset the internal state when aborting key frames header parsing vp56: Release old pictures after a resolution changes vp6: Check for huffman tree build errors vp56: Check for missing reference frame data cinepak: Fix invalid read access on extra data vmd: fix segfaults on corruped streams cook: Fix js_vlc_bits value validation for joint stereo segafilm: Check for memory allocation failures in segafilm demuxer. segafilm: Fix potential division by 0 on corrupted streams in the demuxer Fixed segfault on corrupted sega streams in the demuxer. Fixed deference of NULL pointer in motionpixels decoder. libx264: support 9- and 10-bit output. h264: correct implicit_weight for field-interlaced pictures. mpegvideo: set correct offset for edge emulation buffer. mpegvideo: fix position of bottom edge. Conflicts: libavcodec/motionpixels.c libavcodec/mpegvideo.c libavcodec/version.h libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: support 9- and 10-bit output.Anton Khirnov2011-10-06
| |
* | libx264: Fix loop failure due to bufsize becoming 0Michael Niedermayer2011-10-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: remove check_default_settings()Michael Niedermayer2011-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: free x4->seiMichael Niedermayer2011-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix a buffer overflow in libx264 interface to x264 encoder. Previous code ↵Mike Scheutzow2011-09-26
| | | | | | | | | | | | | | ignored the compressed buffer size passed in. This change returns as many complete NALs as can fit in the buffer, and logs an error message. Signed-off-by: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-16
|\| | | | | | | | | | | | | | | * qatar/master: libx264: introduce slice-max-size option Fixed size given to init_get_bits(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: introduce slice-max-size optionLuca Barbato2011-09-16
| | | | | | | | Yet another option useful for low latency streaming.
* | libx264: fix overwriting presets with flags2Andrew Wason2011-09-12
| | | | | | | | | | This fixes overwriting x264 preset settings for flags2 based options. See https://ffmpeg.org/trac/ffmpeg/ticket/448
* | libx264: fix overwriting preset rc_lookaheadAndrew Wason2011-09-12
| | | | | | | | | | | | This fixes https://ffmpeg.org/trac/ffmpeg/ticket/448 - at least for rc_lookahead. A similar problem still exists for the flags2 based options.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add LATM muxer v210enc: clip values according to specifications v210enc: switch to PIX_FMT_422P10 v210dec: switch to PIX_FMT_422P10 AVOptions: remove AVOption.offset <= 0 checks AVOptions: deprecate av_opt_set_defaults2 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h libx264: fix setting some more parameters libx264: fix setting the H.264 level libx264: add 'direct-pred' private option libx264: add 'partitions' private option Conflicts: Changelog libavcodec/Makefile libavcodec/libx264.c libavcodec/v210enc.c libavfilter/src_movie.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: fix setting some more parametersAnton Khirnov2011-09-07
| | | | | | | | | | | | | | Specifically, trellis, nr, me_range, me_method, subq, b_strategy, keyint_min, chroma_me and coder. Change their defaults to -1 and apply them after x264_param_default_preset() if the user explicitly set them.
| * libx264: fix setting the H.264 levelAndrej Peterka2011-09-07
| | | | | | | | | | | | Move setting it after x264_param_default_preset() Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * libx264: add 'direct-pred' private optionAnton Khirnov2011-09-07
| | | | | | | | Deprecate AVCodecContext.directpred
| * libx264: add 'partitions' private optionAnton Khirnov2011-09-07
| | | | | | | | Deprecate AVCodecContext.partitions.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libx264: add 'cplxblur' private option libx264: add 'deblock' private option libx264: add 'b-bias' private option libx264: fix setting some options. libx264: remove useless assignment ac3dec: avoid pointless alloc and indirection for input_buffer mpeg12: cosmetics: reformat as K&R Conflicts: libavcodec/libx264.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: add 'cplxblur' private optionAnton Khirnov2011-09-06
| | | | | | | | Deprecate AVCodecContext.complexityblur
| * libx264: add 'deblock' private optionAnton Khirnov2011-09-06
| | | | | | | | Deprecate AVCodecContext.deblockalpha/deblockbeta
| * libx264: add 'b-bias' private optionAnton Khirnov2011-09-06
| | | | | | | | Deprecate AVCodecContext.bframebias.
| * libx264: fix setting some options.Anton Khirnov2011-09-06
| | | | | | | | | | | | | | | | | | | | | | Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax, max_qdiff, qblur, qcompress and refs. Change their default values to -1 and only use them if the user explicitly set them. Otherwise x264 defaults are used. Move setting those options after x264_param_default_preset(), so they don't get overwritten by it.
| * libx264: remove useless assignmentAnton Khirnov2011-09-06
| | | | | | | | priv_data is memset to 0.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-01
|\| | | | | | | | | | | | | | | | | | | * qatar/master: avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 libmp3lame: fix typo AVOptions: drop av_ prefix from static av_get_number(). libx264: use X264_THREADS_AUTO constant instead of 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: use X264_THREADS_AUTO constant instead of 0.Anton Khirnov2011-09-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) libx264: set default thread count to 0 (auto) lavc: cosmetics, group deprecated codec flags mpeg12: add 'scan_offset' private option. h263/p encoder: add 'structured_slices' private option. h263/p encoder: add 'obmc' private option. h263p encoder: add 'aiv' private option. h263p encoder: add 'umv' private option. mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option. mjpegdec: add 'extern_huff' private option. mpeg4enc: add 'data_partitioning' private option. snow: add 'memc_only' private option. libx264: add 'mbtree' private option. libx264: add 'psy' private option. libmp3lame: add 'reservoir' private option. mpeg2enc: add 'non_linear_quant' private option mpeg12enc: add drop_frame_timecode private option. mpeg12enc: add intra_vlc private option. VC1: Support dynamic dimension changes mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested lavc: deprecate CODEC_FLAG2_BRDO ... Conflicts: avconv.c libavcodec/libmp3lame.c libavcodec/libx264.c libavcodec/mjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.h libavcodec/vc1.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: set default thread count to 0 (auto)Anton Khirnov2011-08-31
| |
| * libx264: add 'mbtree' private option.Anton Khirnov2011-08-31
| | | | | | | | Deprecate CODEC_FLAG2_MBTREE
| * libx264: add 'psy' private option.Anton Khirnov2011-08-31
| | | | | | | | Deprecate CODEC_FLAG2_PSY
| * libx264: add 'aud' private option.Anton Khirnov2011-08-31
| | | | | | | | Deprecate CODEC_FLAG2_AUD.
| * libx264: add 'fast-pskip' private option.Anton Khirnov2011-08-31
| | | | | | | | Deprecate CODEC_FLAG2_FASTPSKIP.
| * libx264: add '8x8dct' private option.Anton Khirnov2011-08-31
| | | | | | | | Deprecate CODEC_FLAG2_8X8DCT.
| * libx264: add 'mixed-refs' private option.Anton Khirnov2011-08-31
| | | | | | | | Deprecate CODEC_FLAG2_MIXED_REFS.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 08:43:28 +0000