- 24 Jan, 2012 9 commits
-
-
Nicolas George authored
-
Nicolas George authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Clément Bœsch authored
-
Michael Niedermayer authored
* qatar/master: Remove ffmpeg. aacenc: Simplify windowing aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples. aacenc: Deinterleave input samples before processing. aacenc: Store channel count in AACEncContext. aacenc: Move Q^3/4 calculation to it's own table aacenc: Request normalized float samples instead of converting s16 samples to float. aacpsy: Replace an if with FFMAX in LAME windowing. aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons aacenc: cosmetics: move init() and end() to the bottom of the file. aacenc: aac_encode_init() cleanup XWD encoder and decoder vc1: don't read the interpfrm and bfraction elements for interlaced frames mxfdec: fix memleak on mxf_read_close() westwood: split the AUD and VQA demuxers into separate files. Conflicts: .gitignore Changelog Makefile configure doc/ffmpeg.texi ffmpeg.c libavcodec/Makefile libavcodec/aacenc.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/img2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
This reverts commit b3452771. A better solution was implemented by Nathan Caldwell. Conflicts: libavcodec/aacenc.c
-
- 23 Jan, 2012 27 commits
-
-
Michael Niedermayer authored
This reduces the delay when opening the video with quicktime. Idea-by: Maksym Veremeyenko <verem@m1stereo.tv> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Anton Khirnov authored
-
Maksym Veremeyenko authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
This should be moved to tablegen at some point. Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Also fix a typo. Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Nathan Caldwell authored
Macroify sanity checks and check return values of allocs and other functions. Signed-off-by: Alex Converse <alex.converse@gmail.com>
-
Paul B Mahol authored
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
David Mitchell authored
The previous implementation assumed that a new picture would always supersede the previous picture. Similarly, presentation segments were assumed to pertain to the most-recently-read picture. However, each presentation segment may refer to 0 or more pictures by their ID. Picture IDs may repeat, and a repeated picture ID indicates that the old picture for that ID is no longer needed and may be discarded. The new implementation allocates a buffer with one slot for each possible picture ID (the picture ID is a 16-bit field) and properly decodes presentation segments so that all relevant pictures are output upon encountering a display segment. Given that most PGS streams are unlikely to use more than a small fraction of the available picture IDs, it would probably be better to use a more memory-efficient data structure. I'm lazy though, so I leave this to a more motivated individual. I've tested the code with MKV files in VLC (a recent revision from their git repo) and with HandBrake (a version that I hacked up to use ffmpeg's PGS subtitle decoder). Review-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
Fixes bug118, bug120 and bug125 at least Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
This fixes memory corruption when seeking in broken streams. a random mpeg4 in nut file was used to debug. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Paul B Mahol authored
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
-
Hendrik Leppkes authored
This matches the spec as well as the reference decoder, and fixes a bug with interlaced frame decoding. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
-
Janne Grunau authored
-
Paul B Mahol authored
-
Paul B Mahol authored
-
Justin Ruggles authored
They have no code in common.
-
Michael Niedermayer authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
* qatar/master: (25 commits) riff: fix invalid av_freep() calls on EOF in ff_read_riff_info pam: Fix a typo that broke writing and reading PAM files. mxfdec: fix memleak on av_realloc failures mxfdec: Do not parse slices or DeltaEntryArrays. mxfdec: hybrid demuxing/seeking solution mxfdec: Add Avid's essence element key. mfxdec: Separate mxf_essence_container_uls for audio and video. mxfdec: Compute packet offsets properly. mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack. mxfdec: use av_dlog() for 'no corresponding source package found' mxfdec: Make mxf->partitions sorted by offset. mxfdec: parse ThisPartition mxfdec: Speed up metadata and index parsing. mxfdec: Make sure DataDefinition is consistent between material track and source track. mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf mxfdec: Add hack that adjusts the n_delta calculation when system items are present. mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays. mxfdec: Move FooterPartition to MXFContext and make sure it is never zero. mxfdec: check return value of avio_seek mxfdec: skip to end of structural sets ... Conflicts: configure libavcodec/pnm.c libavformat/mxfdec.c libavformat/riff.c libavformat/rtsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
- 22 Jan, 2012 4 commits
-
-
Philip Langdale authored
This was a regression that came in when I switched to using the h.264 annex b filter all the time. As the filter modifies extradata, its use violates the statelessness assumption that exists in the 'ffmpeg' command line tool, and maybe elsewhere. It assumes that a docoder can be reinitalised and pointed to an existing stream and get the same results. For now, the only way to meet this requirement is to backup the extradata. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Philip Langdale authored
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Michael Niedermayer authored
This reverts commit 8e8c5131. Fixes Ticket873 Conflicts: tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
Alexander Strasser authored
Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-