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-06-18Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer
* commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer
* commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov
Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
2014-06-18riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov
It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
2014-05-17Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'Michael Niedermayer
* commit '584f88409062f7a134e7391887899e8e723ab6ff': riff: Pass block_align to estimate frame duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-17riff: Pass block_align to estimate frame durationnu774
Fix incorrect wSamplesPerBlock(=0) written for ADPCM_IMA_WAV Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-05-04Initialize riff and wav size fields to -1 instead of 0.Carl Eugen Hoyos
WMP doess not play the output files if the fields are set to 0 and not overwritten (using pipe output). Fixes ticket #3346.
2014-04-30ff_put_wav_header: add flag to force WAVEFORMATEXDaniel Verkamp
Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e: riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs. This flag is used in the Matroska muxer (the cause of the original change) and in the ASF muxer, because the specifications for these formats indicate explicitly that WAVEFORMATEX should be used. Muxers for other formats will return to the original behavior of writing PCMWAVEFORMAT when writing a header for raw PCM. In particular, this causes raw PCM in WAV to generate the canonical 44-byte header expected by some tools. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10Do not allow writing invalid wav channel layouts by default.Carl Eugen Hoyos
Neither WMP nor QT play wav files with too large channel layouts. Fixes ticket #3543.
2014-04-04riff: add ISMP/timecode tagClément Bœsch
2014-04-04riff: Add ITRK tagJames Almer
Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT
2014-03-18ff_put_wav_header: remove manual byte countingDaniel Verkamp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29Support writing E-AC3 in wav.Carl Eugen Hoyos
2014-01-29Move GUID-related objects to riffenc.c and riff.c.Carl Eugen Hoyos
This simplifies the following eac3-in-wav patch.
2013-12-23avformat/riffenc: indentPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-23riffenc: add option to ff_put_bmp_header to ignore extradataPeter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472'Michael Niedermayer
* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472': riff: Move muxing code to a separate file Conflicts: configure libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06riff: Move muxing code to a separate fileDiego Biurrun