Michael Niedermayer
25ca8aef54
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
...
* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
av_memcpy_backptr: optimise some special cases
mpegvideo: simplify dxy calculation in hpel_motion()
build: add rules to generate preprocessed source files
Conflicts:
Makefile
libavutil/mem.c
library.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 13:30:51 +01:00
Mans Rullgard
33db40f8d3
configure: sort cpuflags section by architecture
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23 12:07:23 +00:00
Mans Rullgard
457cc333b4
configure: properly support DEC/Compaq compiler
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23 12:07:11 +00:00
Mans Rullgard
4a606c830a
av_memcpy_backptr: optimise some special cases
...
- Add special cases for offsets of 2, 3, or 4 bytes. This means the
offset is always >4 in the generic case, allowing 32-bit copies to
be used there.
- Don't use memcpy() for sizes less than 16 bytes.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23 12:04:17 +00:00
Mans Rullgard
5e39bb073a
mpegvideo: simplify dxy calculation in hpel_motion()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23 12:03:54 +00:00
Mans Rullgard
c262649291
build: add rules to generate preprocessed source files
...
This is useful for debugging. Dependencies for these files are not
generated due to limitations in many compilers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23 12:03:32 +00:00
Michael Niedermayer
e9c372362c
id3v2: restructure compressed and unsync code
...
This should fix the interaction between the 2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 03:28:20 +01:00
Michael Niedermayer
0560b28f12
ffv1dec: remove incorrect assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 02:42:00 +01:00
Michael Niedermayer
3616afced6
rmdec: fix av_log level and context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 01:19:48 +01:00
Michael Niedermayer
2fc0cbd9a6
truemotion2: Fix av_log level and context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 01:19:26 +01:00
Michael Niedermayer
801a2a1df0
mpeg12: fix av_log level and context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 01:18:53 +01:00
Michael Niedermayer
42dde253ec
dcadec: fix av_log level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 01:18:31 +01:00
Michael Niedermayer
be89693ddc
avidec: try to support oddly muxed MMES stream
...
Fixes ticket1804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 23:20:35 +01:00
Carl Eugen Hoyos
dd6abc921a
vqavideo: Reinitialise the actually used partial codebook bytestream-reader.
...
Fixes ticket #1942 .
2012-11-22 22:28:17 +01:00
Paul B Mahol
6aa6baa4f2
xmv: signal EOF
...
Fixes #1946 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-22 20:37:24 +00:00
Michael Niedermayer
66b45d8f7a
movenc: fix assert failure caused by rounding.
...
Fixes Ticket1820
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 20:58:06 +01:00
Paul B Mahol
32cd3a7c16
ADPCM AFC decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-22 19:27:44 +00:00
Michael Niedermayer
08e26e7f5c
id3v2: print ver/flags/len on debug level.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 19:31:04 +01:00
Stefano Sabatini
4a753fc5f7
tests: prefer ffprobe -show_entries to -show_format_entry
...
The latter option was deprecated.
2012-11-22 15:57:41 +01:00
Michael Niedermayer
a9cfbf6d4b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
id3v2: fix reading unsynchronized frames.
cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
apetag: fix error handling in ff_ape_parse_tag()
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 15:36:50 +01:00
Stefano Sabatini
c8a5365dcf
ffprobe: implement -sections option
2012-11-22 14:19:29 +01:00
Stefano Sabatini
196765a7cc
ffprobe: implement subsection field selection through the -show_entries option
2012-11-22 14:19:25 +01:00
Anton Khirnov
9ae80e6a9c
id3v2: fix reading unsynchronized frames.
...
Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to
'ff ff ff', while it should be 'ff ff 00 ff'.
Fixes Bug 395.
CC: libav-stable@libav.org
2012-11-22 13:40:04 +01:00
Stefano Sabatini
f67ebf5b77
lavfi/avfiltergraph: improve error message in graph_check_validity()
...
Fix trac ticket #1944 .
2012-11-22 13:14:20 +01:00
Stefano Sabatini
eb87b340e8
lavfi/drawtext: add support for printing frame numbers
...
Fix trac ticket #1949 .
2012-11-22 13:14:19 +01:00
Tim Nicholson
dcbf72836c
ffmpeg: add setting of field_order flag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 05:30:43 +01:00
Michael Niedermayer
91743fb730
frwu: do not set interlacing flags.
...
Our fate frwu sample is definitely not interlaced.
If someone has a interlaced frwu file, please contact us.
Without this change the field order patch would cause
incorrect interlacing information to be written when
using frwu input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 05:21:38 +01:00
Michael Niedermayer
305a935968
brender: move declaration out of for() to make old compilers happy.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 01:07:16 +01:00
Aleksi Nurmi
492a5f835c
brender_pix: a new image decoder
...
PIX is an image file format that was used by the BRender 3d engine.
Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 01:06:25 +01:00
Carl Eugen Hoyos
2e08a82d5e
Fix the path to the C99-to-C89 Converter & Wrapper to the only existing repository.
...
Ronald deleted his public c99-to-c89 repository today.
2012-11-22 00:46:14 +01:00
Stefano Sabatini
3a0f3ffe8e
ffmpeg: fix weird reindent
2012-11-22 00:13:14 +01:00
Stefano Sabatini
02b4ae0427
ffmpeg: print debug_ts off and off_time values with timestamp helper routines
2012-11-22 00:13:14 +01:00
Bojan Zivkovic
e41b518555
mips: Fixing HAVE_MIPSFPU dependencies
...
Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:57:29 +01:00
Peter Ross
bdba96e93c
use correct doxygen parameter direction syntax
...
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:56:15 +01:00
Peter Ross
9ccc349f77
ensure comment blocks that contain doxygen commands start with double asterix
...
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:55:15 +01:00
Piotr Bandurski
88161b2a52
siff: signal EOF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:52:20 +01:00
Piotr Bandurski
9530439e5f
segafilm: signal EOF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:51:21 +01:00
Piotr Bandurski
1ed7ca00dc
bethsoftvid: signal EOF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:22:38 +01:00
Piotr Bandurski
425d0888c3
bfi: signal EOF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:22:38 +01:00
Paul B Mahol
8e6957964e
yop: fix 10l typo
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-21 20:15:02 +00:00
Michael Niedermayer
b93c933cd2
imgconvert-test: count the number of unused pixel format values.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 20:25:30 +01:00
Michael Niedermayer
fb1bb97d87
imgconvert-test: skip pix formats without name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 20:25:30 +01:00
Stefano Sabatini
64dc383de5
ffprobe: fix typo in a comment
2012-11-21 20:17:57 +01:00
Stefano Sabatini
6ca9c74cc6
ffprobe: add "," at the end of enum list
2012-11-21 20:17:57 +01:00
Michael Niedermayer
2c5d911166
imgconvert-test: test alpha flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 20:07:34 +01:00
Michael Niedermayer
1dafbdac65
pixdesc: fix alpha flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 20:07:34 +01:00
Michael Niedermayer
c9ad2e9aa3
imgconvert: remove avg_bits_per_pixel(), its redundant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 20:07:17 +01:00
Peter Ross
0705cbd002
bink: return AVERROR_EOF upon reaching end of file
...
Fixes ticket #1935 .
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 19:25:20 +01:00
Michael Niedermayer
60b59d657e
codec_descriptors: fix typo in mpeg 2 video
...
Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 18:25:01 +01:00
Michael Niedermayer
ea5adf7080
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
flashsv: Drop unused function and struct parameters
pcm: fix decoding of pcm_s16le_planar on big-endian
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 18:12:13 +01:00