99eb31e263
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (25 commits)
Replace custom DEBUG preprocessor trickery by the standard one.
vorbis: Remove non-compiling debug statement.
vorbis: Remove pointless DEBUG #ifdef around debug output macros.
cook: Remove non-compiling debug output.
Remove pointless #ifdefs around function declarations in a header.
Replace #ifdef + av_log() combinations by av_dlog().
Replace custom debug output functions by av_dlog().
cook: Remove unused debug functions.
Remove stray extra arguments from av_dlog() invocations.
targa: fix big-endian build
v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
vfwcap: add a framerate private option.
v4l2: add a framerate private option.
libdc1394: add a framerate private option.
fbdev: add a framerate private option.
bktr: add a framerate private option.
oma: check avio_read() return value
nutdec: remove unused variable
Remove unused variables
swscale: allocate larger buffer to handle altivec overreads.
...
Conflicts:
ffmpeg.c
libavcodec/dca.c
libavcodec/dirac.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pthread.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/shorten.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavdevice/dv1394.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavformat/4xm.c
libavformat/apetag.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/mmf.c
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/oggdec.c
libavformat/oggparseogm.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/rtpdec_latm.c
libavformat/sauce.c
libavformat/sol.c
libswscale/utils.c
tests/ref/vsynth1/error
tests/ref/vsynth2/error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-03 05:19:30 +02:00
f190f676bc
Replace custom DEBUG preprocessor trickery by the standard one.
2011-06-03 00:44:06 +02:00
0fc9c6554e
Remove pointless #ifdefs around function declarations in a header.
2011-06-03 00:44:04 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
0c733da8e2
Fix Doxygen @param command attribute syntax.
...
The [in] and [out] attributes have to be appended to the @param command.
Originally committed as revision 24283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 10:43:42 +00:00
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
c404e783b9
Move transform declarations out of IVIBandDesc so indeo4 can use them as well.
...
Originally committed as revision 23577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-11 08:49:15 +00:00
0933f55829
Prepare Indeo4 (step 1): upscale indeo5 base tables by 2 and convert those into uint16_t.
...
Originally committed as revision 23523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-08 09:20:12 +00:00
25e20240b1
Remove unused variables.
...
Originally committed as revision 23389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-30 17:12:50 +00:00
9c6b3b97d7
Add the forgotten ff_ prefix to the shareable scan patterns.
...
Originally committed as revision 23341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 20:22:29 +00:00
220f2bd9c5
move indeo5 scan patterns into ivi_common.c
...
so those can be shared by indeo4.
Originally committed as revision 23335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 13:25:16 +00:00
15f9fa3d61
Fix signedness of q_delta field of the IVIMbInfo.
...
Patch by Maxim max_pole () gmx * de
Originally committed as revision 23170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-19 06:46:50 +00:00
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
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
2010-04-20 14:45:34 +00:00
e322aacedd
Encapsulate VLC information needed for decoding blocks and macroblocks in
...
Indeo 5 into single structure IVIHuffTab and factorize code using it.
Based on patch by Maxim (max_pole at German GMX)
Originally committed as revision 22092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-27 12:32:31 +00:00
4982a77e56
Make it clear that ff_ivi_init_static_vlc() does not need arguments
...
Originally committed as revision 22091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-27 12:12:56 +00:00
9068f36dcc
Macroblock and block Huffman code sets are to be used by both Indeo 4 and
...
Indeo 5, so make them global and move their initialization to the common place
as well. And fix static VLC initialization, as ff_ivi_create_huff_from_desc()
used old way to do so.
Originally committed as revision 21962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 13:51:32 +00:00
6713b6b120
Remove outdated comment.
...
Patch by Maxim, max_pole gmx de
Originally committed as revision 21837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-15 17:37:38 +00:00
1cf3168516
Indeo Video Interactive 4 and 5 common code and DSP functions.
...
Reviewed and corrected by myself because there were no other volunteers in the
last weeks.
Originally committed as revision 21531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 08:10:17 +00:00
Michael Niedermayer
Diego Biurrun
Mans Rullgard
Maxim Poliakovski
Kostya Shishkov