summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.h
Commit message (Collapse)AuthorAge
* 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 remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: add option for dithering during sample format conversion to s16 mpeg12: do not decode extradata more than once. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: do not decode extradata more than once.Anton Khirnov2012-12-19
| | | | | | | | | | | | Fixes CVE-2012-2803. CC: libav-stable@libav.org
| * Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"Janne Grunau2011-10-24
| | | | | | | | | | | | | | | | This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91 since it broke slice threading. Slice threading just duplicates MpegEncContext so every value used during mpeg_decode_slice has to be in it. A second patch will fix the illusion that Mpeg1Context is available in mpeg_decode_slice.
* | mpeg12: fix logic that prevents extradata from being parsed twice.Michael Niedermayer2012-05-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"Michael Niedermayer2011-10-24
| | | | | | | | | | | | | | | | | | This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h
* | Revert "mpeg12: move closed_gop from MpegEncContext to Mpeg1Context"Michael Niedermayer2011-10-24
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 3fc08304322ce3ed0e4a71efde78ae5e0d5c910c. The revert is done because the reasoning behind the commit was flawed, closed_gop is not mpeg1/2 specific. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h
* | 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>
| * mpeg12: move closed_gop from MpegEncContext to Mpeg1ContextAnton Khirnov2011-10-23
| | | | | | | | It's MPEG-1/2 specific.
| * mpeg12: move full_pel from MpegEncContext to Mpeg1ContextAnton Khirnov2011-10-23
| | | | | | | | It's MPEG-1 specific.
| * mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.hAnton Khirnov2011-10-23
| | | | | | | | It will be used in vdpau code.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Make dc_lum_vlc and dc_chroma_vlc non-static symbols,Vitor Sessak2011-01-05
| | | | | | this fixed the decoding of version 3 PSX MDEC files. Originally committed as revision 26230 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpeg12: fix non-standard use of "extern inline"Måns Rullgård2009-05-17
| | | | | | | | Rename ff_mpeg1_decode_block_intra to mpeg1_decode_block_intra and make it static. Add ff_mpeg1_decode_block_intra as plain extern function calling mpeg1_decode_block_intra. Originally committed as revision 18859 to svn://svn.ffmpeg.org/ffmpeg/trunk
* convert mpeg1_decode_block_intra() to inline globalPeter Ross2009-02-05
| | | | Originally committed as revision 17000 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-31
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.Diego Biurrun2008-08-20
| | | | | | Now that it is exported, this should avoid confusion and name clashes. Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately.Diego Biurrun2008-08-19
| | | | Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-17
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* forgot to svn add mpeg12.h in r9477Aurelien Jacobs2007-07-05
Originally committed as revision 9487 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 14:27:19 +0000