bff2afb3e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-10 14:06:20 +02:00
a0845bae49
mjpeg: Rename some symbols to avpriv_* instead of ff_*
...
These symbols will be used from the RTP/JPEG depacketizer.
Signed-off-by: Martin Storsjö <martin@martin.st >
2012-09-09 22:22:07 +03: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
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
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
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
2009-02-01 02:00:19 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
5a89396989
remove duplicate tables
...
Originally committed as revision 13959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 11:33:49 +00:00
7b94177e37
Group all copyright and author notices together.
...
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:37:29 +00:00
944721c160
add proper prefix to new mjpeg extern func/var
...
Originally committed as revision 9049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 16:45:55 +00:00
4922a5b0ee
split mjpeg.c into an encoder and a decoder file
...
Originally committed as revision 9048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 16:29:11 +00:00
37c26ae9ff
remove some unused mjpeg encoding variables
...
(they were always set to a constant value)
Originally committed as revision 9023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-14 11:53:27 +00:00
7fcf41091e
jpegls encoder does not call this function, so remove useless tests
...
Originally committed as revision 9022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-13 23:22:05 +00:00
6ba04c2b03
split jpeg_ls into jpeglsdec, jpeglsenc and jpegls
...
Originally committed as revision 9021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-13 23:16:56 +00:00
cd61e40781
allow to enable or disable every bitstream filters individually
...
Original patch by Jason Millard jsm174 _at_ gmail
Date: On Fri, 11 May 2007 11:14:01 -0400
Subject: [FFmpeg-devel] enable/disable bitstream filters?
Originally committed as revision 9010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 23:33:53 +00:00
b16560a389
move mjpeg parser in its own file
...
Originally committed as revision 8987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 22:37:36 +00:00
c53d2d9042
make some parser parameters const to avoid casting const to non-const
...
Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 00:47:03 +00:00
4ea385bbbc
compile mjpeg parser if requested
...
Originally committed as revision 8766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 00:36:53 +00:00
a7b91ac6de
cosmetics: remove my email address
...
Originally committed as revision 8764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-20 23:59:22 +00:00
d3255f6fd8
fix mjpeg.mov
...
Originally committed as revision 8738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 08:53:03 +00:00
fe2ad119e9
fix playback of angels_480-mjpegcompress.avi
...
Originally committed as revision 8737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-14 22:58:23 +00:00
6b5e72c994
fix playback of odd_height.mov
...
this isnt the most beautifull solution but at least it works independant of the
random height in mov and it doesnt add any secholes
Originally committed as revision 8736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-14 22:22:34 +00:00
6c3dba5760
correct another possible buffer overflow where interlaced would
...
get stuck to 1 but then width/height would change and interlaced
wouldnt be reset ...
Originally committed as revision 8735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-14 22:05:12 +00:00
1106e4abe4
remove MpegEncContext, patch by baptiste
...
approved by me already but apparently forgotten
Originally committed as revision 8733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-14 18:42:50 +00:00
f8fb86e9bb
cosmetics: indentation
...
Originally committed as revision 8593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 22:20:51 +00:00
efb0c399ca
support for the THP game format by Marco Gerards, mgerards xs4all nl
...
Originally committed as revision 8587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 14:28:48 +00:00
9a63497b0f
support for mjpeg bottom field first in mov
...
Originally committed as revision 8192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 12:26:07 +00:00
eafcac6ac8
cosmetics: Fix another common typo, dependAnt --> dependEnt.
...
Originally committed as revision 8114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 09:41:43 +00:00
391fcef9a9
100l: forgot to reset LS mode on new frame
...
Originally committed as revision 8053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-21 18:10:25 +00:00
bcdf0d2697
Change some dprintf to av_log
...
Originally committed as revision 7964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 16:06:50 +00:00
5959a29893
Fix incorrect use of ff_get_fourcc that made mjpgb not play on big endian.
...
Fixes bug 739.
Originally committed as revision 7875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 17:35:36 +00:00
71e445fca3
Replace deprecated PIX_FMT names by the newer variants.
...
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 01:48:09 +00:00
fead30d444
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
...
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
1a1c53856f
mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
...
Originally committed as revision 7201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 14:06:21 +00:00
426b11a833
Decode non-interleaved scans
...
Originally committed as revision 7143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-21 06:15:18 +00:00
6ffdc53de9
Some progressive JPEG support
...
Originally committed as revision 7131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 05:21:17 +00:00
9efe56f691
JPEG-LS 16-bit gray support
...
Originally committed as revision 6781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-24 05:01:04 +00:00
b78e7197a8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
...
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
2bb7875987
mjpeg 4:2:2 encoding support
...
Originally committed as revision 6550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-04 12:49:52 +00:00
191e8ca752
fix some signedness warnings
...
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 19:47:39 +00:00
75807fe26e
Zero number of current scan after decoding one picture.
...
This fixes grayscale JPEG-LS decoding.
Originally committed as revision 6306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-21 04:28:46 +00:00
ad8812be8f
remove useless code
...
Originally committed as revision 5256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-31 18:22:35 +00:00
002a7414b5
simplify loop a little
...
Originally committed as revision 5255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-31 18:04:36 +00:00
78d2d4e111
do UPDATE_CACHE only when needed (which should be VERY rare)
...
Originally committed as revision 5254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-31 17:43:28 +00:00
e7e2025a53
+ (sign&1) -> -sign (1 instruction less)
...
Originally committed as revision 5253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-31 17:01:58 +00:00
ac2549b583
avoid hard to predict branch (idea by arpi)
...
Originally committed as revision 5252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-31 16:50:43 +00:00
60f3c0b8fc
fix gcc 2.95 compilation
...
Originally committed as revision 5243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-29 21:11:57 +00:00
b88a718a11
avoid if(i>=63) check at the end of decode_block()
...
Originally committed as revision 5239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-29 09:20:44 +00:00
415365d225
avoid i++ in decode_block()
...
Originally committed as revision 5238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-29 09:13:43 +00:00
7d2b787daa
minor optimization of decode_block()
...
Originally committed as revision 5237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-29 08:41:53 +00:00
22dde0e955
optimizations by arpi
...
Originally committed as revision 5235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-29 01:59:24 +00:00
