Age | Commit message (Collapse) | Author |
|
* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...
Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This reverts commit f8bed30d8b176fa030f6737765338bb4a2bcabc9. The reason
for this is that the overlap filter, which runs after IDCT, should run
on unclamped values, and thus IDCT and put_pixels() cannot be merged if
we want to attempt to be bitexact.
|
|
|
|
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
* qatar/master:
avio: add more documentation for AVIOContext.
Parse sprite data for WMVP and WVP2, and decode sprites for the latter
Replace outdated info on the FAQ
Redefine sameq
pad: fix example explanation
gradfun: add notice from the MPlayer manual
eval: add support for trunc, ceil, and floor functions
documentation: add setdar and setsar description to filters.texi
avio: document some members of AVIOContext.
avio: document avio_close().
avio: cosmetics, vertically align comments.
avio: cosmetics, group the reading functions.
avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
avio: cosmetics, move AVIOContext to start of the file.
avio: update file header.
os: fix OpenBSD/PowerPC compilation
pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
oggdec: fix demuxing chained audio streams
fix typo
Conflicts:
doc/filters.texi
libavformat/avio.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Anton Khirnov <anton@khirnov.net>
|
|
The attached patch fixes the jerky playback of VC-1 content with pulldown. The pulldown flags were incorrectly set. They must be correct in order to display the frames with the correct timing as mentioned in the specifications: "SMPTE 421M: VC-1 Compressed Video Bitstream Format and Decoding Process". More precisely the following tables:
Table 20: Progressive P picture layer bitstream for Advanced Profile
Table 22: Progressive B picture layer bitstream for Advanced Profile
Table 23: Progressive Skipped picture layer bitstream for Advanced Profile
Table 82: Interlaced Frame I and BI picture layer bitstream for Advanced Profile
Table 83: Interlaced Frame P picture layer bitstream for Advanced Profile
Table 84: Interlaced Frame B picture layer bitstream for Advanced Profile
Table 85: Picture Layer bitstream for Field 1 of Interlace Field Picture for Advanced Profile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* newdev/master: (33 commits)
Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
Add kbdwin.o to AC3 decoder
Detect byte-swapped AC-3 and support decoding it directly.
cosmetics: indentation
Always copy input data for AC3 decoder.
ac3enc: make sym_quant() branch-free
cosmetics: indentation
Add a CPU flag for the Atom processor.
id3v2: skip broken tags with invalid size
id3v2: don't explicitly skip padding
Make sure kbhit() is in conio.h
fate: update wmv8-drm reference
vc1: make P-frame deblock filter bit-exact.
configure: Add the -D parameter to the dlltool command
amr: Set the AVFMT_GENERIC_INDEX flag
amr: Set the pkt->pos field properly to the start of the packet
amr: Set the codec->bit_rate field based on the last packet
rtsp: Specify unicast for TCP interleaved streams, too
Set the correct target for mingw64 dlltool
applehttp: Change the variable for stream position in seconds into int64_t
...
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/ac3dec.c
libavformat/avio.h
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Merging these functions allows merging some loops, which makes the
results (particularly after SIMD optimizations) much faster.
(cherry picked from commit f8bed30d8b176fa030f6737765338bb4a2bcabc9)
|
|
Merging these functions allows merging some loops, which makes the
results (particularly after SIMD optimizations) much faster.
|
|
(cherry picked from commit 12802ec0601c3bd7b9c7a2503518e28fd5e7d744)
|
|
|
|
In all 3 cases, the decoding continues and thus a warning would be sufficient.
Helps application that catch them with own log handers to handle them
accordingly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ae2104791ffa8466d3f6972ed0793b2a165daabe)
|
|
In all 3 cases, the decoding continues and thus a warning would be sufficient.
Helps application that catch them with own log handers to handle them
accordingly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 25208 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
As a side effect it will also decode a lot of P-frames from those.
Originally committed as revision 24161 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
to inform user why decoder produces no output.
Originally committed as revision 20196 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Includes mmx2 asm for the various functions.
Note that the actual idct still does not have an x86 SIMD implemtation.
For wmv3 files using regular idct, the decoder just falls back to simple_idct,
since simple_idct_dc doesn't exist (yet).
Originally committed as revision 19204 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
consistent.
Originally committed as revision 19203 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
shared between decoder and parser in vc1.c.
Originally committed as revision 19152 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
CODEC_CAP_DR1
Originally committed as revision 19111 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18987 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18839 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18730 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
only avctx->{width,height} and don't touch coded_{width,height} when parsing
them. This fixes the case when coded and display dimensions differ by more
than one macroblock.
Originally committed as revision 18665 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18658 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18639 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18638 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18534 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18521 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18520 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18518 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18517 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18511 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18300 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
AVHWAccel infrastructure.
Originally committed as revision 18135 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17594 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17587 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Gwenole Beauchesne <g$lastname> <at> <(antonym of "joined")-desktop><com>
Originally committed as revision 17561 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
by Gwenole Beauchesne gbeauchesne splitted desktop com
Originally committed as revision 17539 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
"'inline' is not at beginning of declaration" with -Wextra.
Originally committed as revision 17392 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
structure
into VC-1 context.
Patch by Gwenole Beauchesne
(gbeauchesne <whirlpool> splitted <dash> desktop <dit> com)
Thread [PATCH][VC-1] Record extra syntax elements for VA API support
Originally committed as revision 16859 to svn://svn.ffmpeg.org/ffmpeg/trunk
|