summaryrefslogtreecommitdiff
path: root/libavcodec/h263.h
Commit message (Collapse)AuthorAge
* Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-27
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'Michael Niedermayer2015-06-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d': mpegvideo: h263: Move all tables to a single file Conflicts: libavcodec/h263.h libavcodec/h263data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: h263: Move all tables to a single fileVittorio Giovara2015-06-12
| |
* | avcodec: Pass PutBitContext into ff_h263_encode_motion() instead of ↵Michael Niedermayer2015-05-24
| | | | | | | | | | | | | | | | | | MpegEncContext This avoids the need to dereference MpegEncContext->pb if it is already available outside ff_h263_encode_motion() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h263: Remove unused argument of h263_get_motion_length()Michael Niedermayer2015-05-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42': mpegvideo: Drop flags and flags2 Conflicts: libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/ratecontrol.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop flags and flags2Vittorio Giovara2015-05-22
| | | | | | | | They are just duplicates of AVCodecContext members so use those instead.
* | Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | | | | | | | * commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845': h263: Convert function to macro Conflicts: libavcodec/h263.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Convert function to macroVittorio Giovara2015-04-28
| |
* | Merge commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | * commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d': h263: Drop commented-out code and a related otherwise unused function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: Drop commented-out code and a related otherwise unused functionVittorio Giovara2015-04-28
| |
* | Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'Michael Niedermayer2014-11-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2': lavu: move internal define to the only places where it is used Conflicts: libavcodec/h264_cabac.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: move internal define to the only places where it is usedVittorio Giovara2014-11-24
| |
* | Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer2014-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun2014-06-18
| |
* | h263: remove unused ff_h263_find_resync_marker()Michael Niedermayer2013-11-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | * commit '28240a60c1b5ce276e947ba013271ec009adc078': lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.hAnton Khirnov2013-10-31
| | | | | | | | It's for internal use only.
* | Merge commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | * commit 'c591d4575a6f97fbbe6145304b1ea960e8e81e14': avcodec: Replace local extern declarations for tables with header #includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Replace local extern declarations for tables with header #includesDiego Biurrun2013-08-15
| |
| * lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecsRonald S. Bultje2013-03-06
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Martin Storsjö <martin@martin.st>
* | split out ff_hwaccel_pixfmt_list_420[] over individual codecs.Ronald S. Bultje2013-02-18
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0': h263: remove an unused parameter from ff_h263_decode_init_vlc flac: add channel layout masks for streams with 7 or 8 channels. flac: don't check the number of channels before setting the channel layout. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263: remove an unused parameter from ff_h263_decode_init_vlcAnton Khirnov2013-02-06
| |
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop DCTELEM typedefDiego Biurrun2013-01-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df9b9567518f2840d79a4a96b447ebe1aa326408': lavc: fix decode_frame() third parameter semantics for video decoders Conflicts: libavcodec/cscd.c libavcodec/eamad.c libavcodec/ffv1dec.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/iff.c libavcodec/mjpegdec.c libavcodec/pcx.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: fix decode_frame() third parameter semantics for video decodersAnton Khirnov2012-12-04
| | | | | | | | It's got_frame, not data size
* | Check resync marker only when enabled.Anuj Mittal2012-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo_enc: add cbp_rd flag to mpv_flags.Anton Khirnov2012-02-29
| | | | | | | | Deprecate CODEC_FLAG_CBP_RD.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * h263: Add ff_ prefix to nonstatic symbolsMartin Storsjö2012-02-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Make ff_mba_* arrays const.Reimar Döffinger2011-11-05
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move id3v2 tag writing to a separate file. swscale: add missing colons to x86 assembly yuv2planeX. g722: split decoder and encoder into separate files cosmetics: remove extra spaces before end-of-statement semi-colons vorbisdec: check output buffer size before writing output wavpack: calculate bpp using av_get_bytes_per_sample() ac3enc: Set max value for mode options correctly lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c mpeg12: move closed_gop from MpegEncContext to Mpeg1Context mpeg12: move full_pel from MpegEncContext to Mpeg1Context mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h mpegvideo: remove some unused variables from MpegEncContext. Conflicts: libavcodec/mpeg12.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move get_b_cbp() from h263.h to mpeg4videoenc.cAnton Khirnov2011-10-23
| | | | | | | | It's not used anywhere else.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * multiple inclusion guard cleanupDiego Biurrun2011-05-21
| | | | | | | | | | Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add lots of missing includesMåns Rullgård2010-03-08
| | | | Originally committed as revision 22337 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ff_set_qscale() prototype to mpegvideo.h; it is defined in mpegvideo.cMåns Rullgård2010-03-06
| | | | Originally committed as revision 22262 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split H263 encoder and decoder from common code.Michael Niedermayer2010-01-09
| | | | Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename most non static h263 tables so their name contains h263.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split the mpeg4 encoder and decoder off h263.cMichael Niedermayer2010-01-07
| | | | Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of pointless CONFIG_ANY_H263 preprocessor definition.Diego Biurrun2009-12-30
| | | | Originally committed as revision 20975 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Eliminate CONFIG_ANY_H263_DECODER preprocessor definition.Diego Biurrun2009-12-30
| | | | | | | It is just a logical OR of several decoder definitions, all of which depend on CONFIG_H263_DECODER. So it can just be replaced by the latter. Originally committed as revision 20973 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of pointless CONFIG_WMV_DECODER definition.Diego Biurrun2009-12-30
| | | | Originally committed as revision 20972 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify CONFIG_ANY_H263_DECODER preprocessor definition:Diego Biurrun2009-12-30
| | | | | | There is no need to list decoders that enable the H.263 decoder anyway. Originally committed as revision 20970 to svn://svn.ffmpeg.org/ffmpeg/trunk