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
2014-03-22Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22avcodec: more correct printf specifiersDiego Biurrun
2013-11-26Merge commit '56d061ce9da954560892e3551513d5ecc0439846'Michael Niedermayer
* commit '56d061ce9da954560892e3551513d5ecc0439846': metasound: add last missing modes (8kHz @ 6kbps per channel) Conflicts: Changelog doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26metasound: add last missing modes (8kHz @ 6kbps per channel)Kostya Shishkov
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-14Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'Michael Niedermayer
* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9'Michael Niedermayer
* commit 'ddb839e9286594ff7a862a956402106fca7055c9': metasound: add missing modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14twinvq: support multiple frames per packetKostya Shishkov
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-14metasound: add missing modesKostya Shishkov
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-11-09Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'Michael Niedermayer
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45': metasound: Fix error message argument Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08metasound: Fix error message argumentKostya Shishkov
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-25metasound & twinvqdec: return the number of read bytes from read_bitstreamMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'Michael Niedermayer
* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b': twinvq: set block align for codecs and use it in size checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-26twinvq: set block align for codecs and use it in size checksKostya Shishkov
This both allows factoring out size check for both MetaSound and TwinVQ-VQF decoders and fixes the situation when there are several MetaSound frames stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).
2013-08-08Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'Michael Niedermayer
* commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08Voxware MetaSound decoderKostya Shishkov