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
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>
2015-09-15lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.Michael Niedermayer
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-11avcodec/pcm-dvd: Fix debug == FF_DEBUG_PICT_INFOMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara
2014-09-26Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'Michael Niedermayer
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37': pcm-dvd: Move a variable to a smaller scope Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26pcm-dvd: Move a variable to a smaller scopeDiego Biurrun
This avoids an unused variable warning on big-endian systems.
2014-05-09pcm-dvd: Fix 20bit decodingnu774
Increment the pointer as needed. Bug-Id: 592 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-12-27avcodec/pcm-dvd: reset last header on errorsMichael Niedermayer
Fixes: msan_uninit-mem_7f4fff975a2c_4957_dvd_audio_sample.aob Fixes use of uninitialized memory Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19avcodec/pcm-dvd: print actual block size values in block size changed warningMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19avcodec/pcm-dvd: fix 20/24bit 1 channelMichael Niedermayer
Fixes part of ticket3122 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19avcodec/pcm-dvd: fix 20bit 2 channelsMichael Niedermayer
Fixes part of ticket3122 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pcm-dvd: Minor leftovers Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-13Merge commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30'Michael Niedermayer
* commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30': pcm-dvd: Support channel configuration changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-13pcm-dvd: Minor leftoversChristian Schmidt
Drop a pointless branch in uninit and use the compact copyright.
2013-09-13pcm-dvd: Support channel configuration changesChristian Schmidt
The sample buffering logic does not take into account that the blocksize could change. Reset the buffer if the channel configuration changes, since if there are leftover samples, it is most likely a broken or misconcatenated stream. This could lead to negative numbers for missing_samples during decoding. Thanks to Michael Niedermeyer for pointing these out.
2013-09-01pcm-dvd: use av_freep()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-01pcm-dvd: remove redundant log messagePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-01avcodec/pcm-dvd: discard buffer if block size changedMichael Niedermayer
This prevents a potential crash Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-01pcm-dvd: Fix build on big endianMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-01Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'Michael Niedermayer
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9': pcm_dvd: consolidate pieces from pcm.c and mpeg.c Conflicts: libavcodec/pcm.c libavcodec/version.h libavformat/mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-31pcm-dvd: Fix build on big endianMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-31pcm_dvd: consolidate pieces from pcm.c and mpeg.cChristian Schmidt
Remove the header decoding for PCM audio from mpeg.c and the 20/24bit parts from pcm.c and merge them into a new decoder in pcm-dvd.c. The decoder has added support for samples that span multiple packets and modified 20/24bit group decoding. Both is needed to decode samples that have been generated with DVD-Lab Pro 2. The decoding of 16bit PCM and two channel 24bit is identical to before. No other samples are known to verify the correctness of the encoding this software does. The complete list of tested formats is 48kHz/16bit/2-8 channels 48kHz/24bit/2-5 channels 96kHz/16bit/2-4 channels 96kHz/24bit/2 channels Signed-off-by: Luca Barbato <lu_zero@gentoo.org>