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-27Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'Michael Niedermayer
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27libavformat/aviobuf: keep track of the original buffer-size and restore it ↵Michael Niedermayer
after probe/ensure-seekback Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of ↵Michael Niedermayer
the buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Alias PIX image encoder and decoderVittorio Giovara
2014-03-25Add an .oga muxer.Carl Eugen Hoyos
2014-03-25avformat/riff: add On2 VP7 fourccsPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'Michael Niedermayer
* commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7': mp3dec: export replaygain tags from ID3v2 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'Michael Niedermayer
* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78': Add replaygain side data type and code for parsing replaygain tags. Conflicts: libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'Michael Niedermayer
* commit '25b32586566f285d797737863c97a1c5c9c84e2b': lavf: add an AVStream field for exporting stream-global side data Conflicts: libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24mp3dec: export replaygain tags from ID3v2Anton Khirnov
2014-03-24Add replaygain side data type and code for parsing replaygain tags.Anton Khirnov
2014-03-24lavf: add an AVStream field for exporting stream-global side dataAnton Khirnov
2014-03-24Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'Michael Niedermayer
* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7': mpeg: K&R formatting cosmetics Conflicts: libavformat/mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24mpeg: K&R formatting cosmeticsTanja Batchelor
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-23lavf/concatdec: allow to match streams by id.Nicolas George
That makes the concat demuxer usable with MPEG-PS streams, even when the streams in the different parts are detected in different order.
2014-03-23http: restructure http_connect error handling pathwm4
The authstr memory allocations make it annoying to error in the middle of the header setup code, so apply the usual C error handling idiom to make it easier to error at any point. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'Michael Niedermayer
* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f': movenc: Allow override of major brand in ftyp atom Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23movenc: Allow override of major brand in ftyp atomJohn Stebbins
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
2014-03-23Merge remote-tracking branch 'cus/stable'Michael Niedermayer
* cus/stable: mpegts: fix teletext pts of streams with standalone pcr pid mpegts: add pcr filter for tracking standalone pcr pids mpegts: factorize mpegts filter creator code mpegts: move last_pcr to MpegTSFilter level Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22avformat/udp: cleanup comments, add a warning if receive buffer is ↵rogerdpack
unexpectedly unable to be set high enough which can happen easily in linux Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22mpegts: fix teletext pts of streams with standalone pcr pidMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-03-22mpegts: add pcr filter for tracking standalone pcr pidsMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-03-22mpegts: factorize mpegts filter creator codeMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-03-22mpegts: move last_pcr to MpegTSFilter levelMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-03-22avformat/mp3enc: use av_copy_packet()Michael Niedermayer
Fixes double free Fixes Ticket3476 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-21http: never send 'Cookie: (null)' to the serverwm4
If a domain has some cookies set, but matching the cookie fails due to the port being different, get_cookies() succeeds, but sets cookies to NULL. The caller of get_cookies() didn't check for the NULL value. This also avoids passing NULL to libc string functions, which is undefined behavior Fixes Ticket2180 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'Michael Niedermayer
* commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004': mxf: Lowercase UL strings Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'Michael Niedermayer
* commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5': mxf: Verbose debug logging Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19Merge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1'Michael Niedermayer
* commit '842ea36c747eb6537c4236114346cb7a3e9a8df1': mxf: Override faulty PreviousPartition entries Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'Michael Niedermayer
* commit '92ebb332157195b7c1212e734c5668afbf19cf2b': mxf: Add additional H264 PictureEssenceCoding Conflicts: libavformat/mxf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19mxf: Lowercase UL stringsLuca Barbato
The specification uses lower case most of the time.
2014-03-19mxf: Verbose debug loggingLuca Barbato
Print the UL in code format and in the short format used by the specification.
2014-03-19mxf: Override faulty PreviousPartition entriesLuca Barbato
Some files set the PreviousPartition field to point to its own offset. If we are parsing forward the Previous partition is immediately known and its value could be used, otherwise we can safely point to the header. Reported-By: Jean Baptiste Kempf <jb@videolan.org>
2014-03-19mxf: Add additional H264 PictureEssenceCodingLuca Barbato
Unbreak some MXF Proxy files.
2014-03-18ff_put_wav_header: remove manual byte countingDaniel Verkamp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'Michael Niedermayer
* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065': mpegts: Forward error codes in various functions Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'Michael Niedermayer
* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18mpegts: Forward error codes in various functionsKeiji Costantini
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-18mpegts: K&R formatting cosmeticsKeiji Costantini
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-17avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions ↵Michael Niedermayer
from tkhd This also moves mov_rewrite_dvd_sub_extradata() to mov.c Fixes: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17avformat/mov: fill in subtitle dimensions after parsing tkhdMichael Niedermayer
Sample: NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17avformat/isom: only write the size if its non zero in ↵Michael Niedermayer
mov_rewrite_dvd_sub_extradata() Fixes regression with NeroRecodeSample.mp4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()Michael Niedermayer
This avoids the 2nd buffer and fixes the palette truncated check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit '58c215961a9067bb670387bbd72286c30de04b93'Michael Niedermayer
* commit '58c215961a9067bb670387bbd72286c30de04b93': raw, nut: Support rgba64 encoding Conflicts: libavcodec/raw.c libavformat/nut.c See: edf34c346ec9d5d1a790db4b500113bf8d5fac07 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17img2: add j2c file extensionJean First
Some applications use the j2c extension for jpeg2000 codestream files.
2014-03-17raw, nut: Support rgba64 encodingCarl Eugen Hoyos
2014-03-17isom: fix C99-style declarationMichael Niedermayer
2014-03-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacdec: Lower the number of frames required to detect ADTS Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'Michael Niedermayer
* commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932': aacdec: Don't count probed ADTS frames if there are false positives Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16aacdec: Lower the number of frames required to detect ADTSMartin Storsjö
For live audio streams, requiring 500 frames for a stream to be detected is a bit overkill. This allows live ADTS streams that don't start nicely at a frame boundary to start up more quickly, e.g. http://mp3.streampower.be/radio1.aac. Signed-off-by: Martin Storsjö <martin@martin.st>