summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_enc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-261-6/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove h263_msmpeg4 from MpegEncContext.Alex Converse2011-05-251-6/+2
| | | | | | | | It was long ago superseded by msmpeg4_version.
* | mpegvideo_enc: use AV_LOG_ERROR instead of AV_LOG_INFO for two error messagesami_stuff2011-05-251-2/+2
| | | | | | | | | | | | use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-251-21/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove msmpeg4v1 encoder.Anton Khirnov2011-05-241-21/+0
| | | | | | | | | | | | The encoder has never produced files that could be decoded with any software and there should be no reason to create such files anyway.
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-37/+37
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-37/+37
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-221-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition. Introduce slice threads flag. FATE: allow forcing thread-type when doing threaded fate runs. Use av_log_ask_for_sample() where appropriate. error: sort, pack, and align error code and string definitions The stabilization period after version bumps should be one month, not one week. applehttp: Expose the stream bitrate via metadata doc: Add some initial docs on the applehttp demuxer Provide a fallback version of the libm function trunc libavdevice: Define _XOPEN_SOURCE for usleep lavc: provide deprecated avcodec_thread_init until next major version lavc: provide the opt.h header until the next bump error: change AVERROR_EOF value error: remove AVERROR_NUMEXPECTED error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c Conflicts: libavcodec/h264.c libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Introduce slice threads flag.Ronald S. Bultje2011-04-211-0/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Pass VBV delay to the calling application via ctxChristophe Massiot2011-02-151-0/+1
| | | | | | | | | | | | | | | | VBV delay is useful for T-STD compliance in some TS muxers. It is certainly possible to retrieve it by parsing the output of FFmpeg, but getting it from the context makes it simpler and less error-prone. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-281-3/+3
| |
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-6/+6
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make denoise_dct_c() and dct_quantize_trellis_c() static in definitionsMans Rullgard2011-01-251-4/+4
| | | | | | | | | | | | | | | | 1d4da6a460d5b78026e3b854fdd6f469957a054c added static to the prototypes for these fuctions. Adding it to the definitions as well. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make denoise_dct_c and dct_quantize_trellis_c static.Diego Elio Pettenò2011-01-241-0/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Fake-Merge remote-tracking branch 'ffmpeg-mt/master'Michael Niedermayer2011-03-221-11/+13
| |
* | Pass VBV delay to the calling application via ctxChristophe Massiot2011-02-161-0/+1
| | | | | | | | | | | | | | | | | | VBV delay is useful for T-STD compliance in some TS muxers. It is certainly possible to retrieve it by parsing the output of FFmpeg, but getting it from the context makes it simpler and less error-prone. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-301-3/+3
| | | | | | | | (cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-6/+6
| | | | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
* | Make denoise_dct_c() and dct_quantize_trellis_c() static in definitionsMans Rullgard2011-01-261-4/+4
| | | | | | | | | | | | | | | | | | 1d4da6a460d5b78026e3b854fdd6f469957a054c added static to the prototypes for these fuctions. Adding it to the definitions as well. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit aa61e39eac85e26bff0f296b1ec86d4533664adc)
* | Make denoise_dct_c and dct_quantize_trellis_c static.Diego Elio Pettenò2011-01-261-0/+2
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 1d4da6a460d5b78026e3b854fdd6f469957a054c)
* Make mpeg4 encoder log a more explicit error message when the timebaseStefano Sabatini2011-01-051-1/+3
| | | | | | is not valid. Originally committed as revision 26223 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Our ljpeg encoder supports bgra, use the correct constant in the sanity check.Michael Niedermayer2011-01-051-1/+1
| | | | Originally committed as revision 26220 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove PIX_FMT_RGB32 mjpeg encoding, there is no such thing ...Michael Niedermayer2011-01-051-1/+1
| | | | Originally committed as revision 26218 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix YUV444P LJPEG encoding.Michael Niedermayer2011-01-041-0/+6
| | | | Originally committed as revision 26215 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l fix h263 encoder resolution test, array size is 8 not 7Baptiste Coudurier2010-10-021-1/+1
| | | | Originally committed as revision 25305 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix rv20 encoding so the binary decoder can decode it.Michael Niedermayer2010-09-261-1/+1
| | | | Originally committed as revision 25203 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow mpeg encoding with qscale and very low frame rate.James Darnley2010-09-101-1/+1
| | | | | | Patch by James Darnley, james D darnley A gmail Originally committed as revision 25102 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check rc_buffer_size value using integer arithmeticMåns Rullgård2010-09-071-1/+1
| | | | | | | | | | Using floating-point here can cause erroneous rejection of parameters due to rounding errors leading to a slightly too large result. This fixes the mxf regression test with gcc 4.5 on x86_32. Originally committed as revision 25060 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change all occurences of "inofficial" to "unofficial" in code, commentsRodney Baker2010-07-031-1/+1
| | | | | | | | and options. Keep old options until next major version bump. Patch by Rodney Baker, rodney d baker a iinet d net d au Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-6/+6
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Always check if ff_alloc_picture() succeeds.Pavel Pavlov2010-03-231-5/+14
| | | | | | Patch by Pavel Pavlov, pavel summit-tech ca Originally committed as revision 22648 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change ref_index structure so it matches how its organized in h264.Michael Niedermayer2010-03-231-1/+1
| | | | | | Also revert the related error concealment hotfix. Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefix for mpeg2_dc_scale_table.Michael Niedermayer2010-03-151-2/+2
| | | | Originally committed as revision 22556 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support intra_dc_precision>8 in jpegMichael Niedermayer2010-03-151-1/+3
| | | | Originally committed as revision 22554 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use mpeg2 quantization bias for mjpeg.Michael Niedermayer2010-03-151-4/+1
| | | | | | this seems to improve RD performance. Originally committed as revision 22550 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ff_sqrt() to libavutil/intmath.hMåns Rullgård2010-03-081-0/+1
| | | | Originally committed as revision 22345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use LOCAL_ALIGNED macro for local arraysMåns Rullgård2010-02-171-1/+1
| | | | Originally committed as revision 21866 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård2010-01-221-1/+1
| | | | Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing internal.h to files calling ff_match_2uint16().Alexander Strange2010-01-111-0/+1
| | | | | | | | | | | | Fixes warnings: libavcodec/mpegvideo_enc.c:574: warning: implicit declaration of function 'ff_match_2uint16' libavcodec/ituh263enc.c:143: warning: implicit declaration of function 'ff_match_2uint16' libavcodec/svq1enc.c:97: warning: implicit declaration of function 'ff_match_2uint16' Originally committed as revision 21133 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a function to match a 2 element vector of uint16_t and use it in h263 ↵Michael Niedermayer2010-01-091-1/+2
| | | | | | | | and svq1 instead of custom and bloated code to find an index into a w/h array. Originally committed as revision 21113 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split the mpeg4 encoder and decoder off h263.cMichael Niedermayer2010-01-071-13/+1
| | | | Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move forgotton "AVCodec flv_encoder" over to flvenc.c.Michael Niedermayer2010-01-071-12/+0
| | | | Originally committed as revision 21052 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split out flv encoding.Michael Niedermayer2010-01-071-0/+1
| | | | Originally committed as revision 21050 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of pointless CONFIG_ANY_H263 preprocessor definition.Diego Biurrun2009-12-301-1/+0
| | | | Originally committed as revision 20975 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace CONFIG_ANY_H263_ENCODER definition by CONFIG_H263_ENCODER.Diego Biurrun2009-12-281-5/+5
| | | | | | | CONFIG_ANY_H263_ENCODER is just a logical OR of H.263 family definitions, for which the build system enables CONFIG_H263_ENCODER anyway. Originally committed as revision 20950 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check sample_aspect_ratio validity for mpeg4/h263/h263p encoding.Michael Niedermayer2009-12-141-0/+8
| | | | | | Merged from ffmbc0.3 Originally committed as revision 20861 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetic (restructure RGB ljpeg check to be more readable)Michael Niedermayer2009-12-101-8/+8
| | | | Originally committed as revision 20793 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l, Fix YUV ljpeg that i just broke by mistake.Michael Niedermayer2009-12-101-1/+1
| | | | Originally committed as revision 20792 to svn://svn.ffmpeg.org/ffmpeg/trunk