Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-17mpeg12: Add a common function to find the best frame rateMark Thompson
This will be used later in both the mpeg2_metadata filter and the VAAPI MPEG-2 encoder. Also adds a unit test. (cherry picked from commit b5859e0b04bdbe12c97cb12ac10a45d51d2d73c9)
2017-01-11avcodec: add Newtek SpeedHQ decoderSteinar H. Gunderson
This decoder can decode all existing SpeedHQ formats (SHQ0–5, 7, and 9), including correct decoding of the alpha channel. 1080p is decoded in 142 fps on one core of my i7-4600U (2.1 GHz Haswell), about evenly split between bitstream reader and IDCT. There is currently no attempt at slice or frame threading, even though the format trivially supports both. NewTek very helpfully provided a full set of SHQ samples, as well as source code for an SHQ2 encoder (not included) and assistance with understanding some details of the format.
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-02-16avcodec/mpeg12: Remove duplicate block_last_index setting codeMichael Niedermayer
Based on 7c25ffe070c286874a8c3513f7504b90e1626b0c and 58dd885f9ae7feee002773253e345e11e7142739 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-16Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'Derek Buitenhuis
* commit '7c25ffe070c286874a8c3513f7504b90e1626b0c': mpeg1: Make intra-block decoding independent of MpegEncContext Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-09mpeg1: Make intra-block decoding independent of MpegEncContextVittorio Giovara
This allows untangling the eatqi decoder from the MPEG-1 decoder. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-06-12Merge commit '8606e881b02bec2ac24943d22c8afe11d641fac8'Michael Niedermayer
* commit '8606e881b02bec2ac24943d22c8afe11d641fac8': mpeg12: Move the vlc bits to a stand alone file Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-12mpeg12: Move the vlc bits to a stand alone fileLuca Barbato
2015-06-01Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'Michael Niedermayer
* commit 'b2b766914a49c4e3537df3a585e97b98d432edd2': mpegvideo: mpeg12: Move function declarations Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31mpegvideo: mpeg12: Move function declarationsVittorio Giovara
2013-03-28Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'Michael Niedermayer
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f': mpeg12: Move Mpeg1Context declaration to the only place it is used Conflicts: libavcodec/mpeg12.h libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit '1b6d66745ac1768adb387c2227cdcf4452271149'Michael Niedermayer
* commit '1b6d66745ac1768adb387c2227cdcf4452271149': Split MPEG-1/2 decoder code off from MPEG-1/2 common code Conflicts: libavcodec/Makefile libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32'Michael Niedermayer
* commit 'eee2000b41234ae9465c314e18bfec1700181f32': mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27mpeg12: Move Mpeg1Context declaration to the only place it is usedDiego Biurrun
2013-03-27Split MPEG-1/2 decoder code off from MPEG-1/2 common codeDiego Biurrun
2013-03-27mpeg12: Move some ff_mpeg1_* function declarations to a more suitable placeDiego Biurrun
2013-03-27cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* 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>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-12-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-12-20mpeg12: do not decode extradata more than once.Anton Khirnov
Fixes CVE-2012-2803. CC: libav-stable@libav.org
2012-05-11mpeg12: fix logic that prevents extradata from being parsed twice.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-24Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"Michael Niedermayer
This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h
2011-10-24Revert "mpeg12: move closed_gop from MpegEncContext to Mpeg1Context"Michael Niedermayer
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
2011-10-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2011-10-23mpeg12: move closed_gop from MpegEncContext to Mpeg1ContextAnton Khirnov
It's MPEG-1/2 specific.
2011-10-23mpeg12: move full_pel from MpegEncContext to Mpeg1ContextAnton Khirnov
It's MPEG-1 specific.
2011-10-23mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.hAnton Khirnov
It will be used in vdpau code.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-05Make dc_lum_vlc and dc_chroma_vlc non-static symbols,Vitor Sessak
this fixed the decoding of version 3 PSX MDEC files. Originally committed as revision 26230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-17mpeg12: fix non-standard use of "extern inline"Måns Rullgård
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
2009-02-05convert mpeg1_decode_block_intra() to inline globalPeter Ross
Originally committed as revision 17000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31Globally rename the header inclusion guard names.Stefano Sabatini
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
2008-08-20Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.Diego Biurrun
Now that it is exported, this should avoid confusion and name clashes. Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately.Diego Biurrun
Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05forgot to svn add mpeg12.h in r9477Aurelien Jacobs
Originally committed as revision 9487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-10-24Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"Janne Grunau
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.