Michael Niedermayer
04b0fd7e91
Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'
...
* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
h261: K&R formatting and prettyprinting cosmetics
Conflicts:
libavcodec/h261_parser.c
libavcodec/h261data.h
libavcodec/h261dec.c
libavcodec/h261enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:53:57 +02:00
Michael Niedermayer
3d73be071d
Merge commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1'
...
* commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1':
h261: Remove H.261 loop filter from dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:25:49 +02:00
Diego Biurrun
b78f81c803
h261: K&R formatting and prettyprinting cosmetics
2013-04-05 12:25:12 +02:00
Diego Biurrun
ed16c2dbf4
h261: Remove H.261 loop filter from dsputil
...
There is no arch-optimized version of the H.261 loop filter and there
likely will never be, so the dsputil overhead does not give any benefit.
2013-04-05 12:24:28 +02:00
Michael Niedermayer
a984efd104
Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'
...
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
Remove unnecessary dsputil.h #includes
Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26 13:05:10 +01:00
Diego Biurrun
c242bbd8b6
Remove unnecessary dsputil.h #includes
2013-02-26 00:51:34 +01:00
Michael Niedermayer
c065255bba
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aacenc: Fix LONG_START windowing.
aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
avplay: use the correct array size for stride.
lavc: extend doxy for avcodec_alloc_context3().
APIchanges: mention avcodec_alloc_context()/2/3
avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
aacsbr: ARM NEON optimised sbrdsp functions
aacsbr: align some arrays
aacsbr: move some simdable loops to function pointers
cosmetics: Remove extra newlines at EOF
Conflicts:
libavcodec/utils.c
libavfilter/formats.c
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
Alex Converse
7181c4edee
cosmetics: Remove extra newlines at EOF
2012-01-27 17:19:09 -08:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Biurrun
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
Diego Biurrun
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
Måns Rullgård
b3e83c965d
move definition of MB_TYPE_H261_FIL to h261.h so h261.c doesn't
...
need to #include "h261data.h"
Originally committed as revision 9339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-16 15:15:19 +00:00
Panagiotis Issaris
d632239c9c
Split the h261.c file into separate files for the encoder, decoder and common stuff.
...
Originally committed as revision 9090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 12:51:29 +00:00
Diego Biurrun
2029f312e8
Remove redundant #inclusion of common.h, avcodec.h already #includes it.
...
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:00:44 +00:00
Diego Biurrun
3883a99b7d
Move H.261 parser to its own file.
...
Originally committed as revision 8888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 19:38:10 +00:00
Michael Niedermayer
3502a54f59
kill av_mallocz_static() calls in init_rl()
...
Originally committed as revision 8402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 13:19:19 +00:00
Baptiste Coudurier
a57d13b713
throw error if unsupported resolution is used with h261
...
Originally committed as revision 7097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 09:58:34 +00:00
Diego Biurrun
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
Michael Niedermayer
c3e462a8ca
set supported pixel formats for a few encoders (fixes crashes with grayscale)
...
Originally committed as revision 6303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-20 21:17:37 +00:00
Måns Rullgård
0e176c3eb5
remove redundant declarations
...
Originally committed as revision 6153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-02 23:10:28 +00:00
Michael Niedermayer
94c8fbdcad
fix codec timebase and timestamps
...
Originally committed as revision 5998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-14 18:17:14 +00:00
Michael Niedermayer
0f812f5291
fix h261 parsing bug
...
Originally committed as revision 5997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-14 17:58:30 +00:00
Måns Rullgård
af9e7d1810
--enable/disable parsers. Warning: some combinations are broken.
...
Originally committed as revision 5691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 12:02:15 +00:00
Michael Niedermayer
5964935c92
cbp must be >0 here or we are in troubble
...
Originally committed as revision 5420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-29 16:30:56 +00:00
Steve L'Homme
267f7edcd1
(f)printf --> av_log conversion
...
taken from a patch by Steve L'Homme
Originally committed as revision 5127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-08 11:43:10 +00:00
Dieter
1b47fafd9f
make some functions static (patch by Dieter < freebsd at sopwith.solgatos.com >)
...
Originally committed as revision 4905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-28 16:05:06 +00:00
Diego Biurrun
5509bffa88
Update licensing information: The FSF changed postal address.
...
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Michael Niedermayer
8c3eba7c62
skip_idct
...
skip_frame
skip_loop_filter
Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-14 21:39:36 +00:00
Michael Niedermayer
c0df9d75bd
switch to native time bases
...
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer
dee6dde669
avoid unneeded clear_blocks()
...
Originally committed as revision 4157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-25 00:57:48 +00:00
Mike Melanson
160d679c07
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
...
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-24 17:21:11 +00:00
Michael Niedermayer
934982c4ac
avoid buf_size == 0 checks in every decoder
...
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 18:09:06 +00:00
Gianluigi Tiesi
8ff53f5b07
Disable encoders patch by (Gianluigi Tiesi <mplayer netfarm it>)
...
Originally committed as revision 3797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-03 16:13:52 +00:00
Burkhard Plaum
073c2593c9
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
...
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-27 18:10:06 +00:00
Michael Niedermayer
e731697665
fix parser
...
Originally committed as revision 3689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-19 11:37:03 +00:00
Maarten Daniels
ccff9da62a
H261 fixing and cleaning:
...
-corrected wrong value in mv data
-set correct mb_type after adjusting index
-don't use H263 loop filter when the loop filter flag is set but when
using the H261 encoder
-use the same unquantizer as H263 (which is optimized btw)
-removed unused members in H261Context
patch by (Maarten Daniels <maarten.daniels >at< luc >dot< ac >dot< be>)
regression test checksum update by me
Originally committed as revision 3669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-12 01:21:34 +00:00
Michael Niedermayer
5bbad3eb53
cleanup
...
Originally committed as revision 3650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 18:42:31 +00:00
Michael Niedermayer
87b9e6b2dd
simplify ff_h261_reorder_mb_index
...
Originally committed as revision 3649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 18:17:48 +00:00
Michael Niedermayer
1499a1f7df
simplify
...
Originally committed as revision 3648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 17:34:14 +00:00
Michael Niedermayer
9740687b6b
fix and cleanup h261 mb_type selection
...
Originally committed as revision 3647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 17:21:34 +00:00
Michael Niedermayer
13e5b1f684
cleanup
...
Originally committed as revision 3646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 12:12:33 +00:00
Michael Niedermayer
1c3990dbba
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
...
Originally committed as revision 3643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 10:12:57 +00:00
Michael Niedermayer
5f6c92d40c
h.261 loop filter fix
...
closes bug #1033108
Originally committed as revision 3574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-08 22:57:39 +00:00
Michael Niedermayer
8c7aaf5b6d
nonsense removial
...
Originally committed as revision 3573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-08 21:45:29 +00:00
Michael Niedermayer
21adafec2a
lowres width/height cleanup 3rd try
...
Originally committed as revision 3522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 11:50:56 +00:00
Michael Niedermayer
4f8a831994
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
...
Originally committed as revision 3518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 02:39:55 +00:00
Maarten Daniels
49e5dcbce5
H.261 decoder improvements
...
- GOB's can exist of only MBA_STUFFING codes: it crashed before, but it is fixed now
- Clearer code
- Some extra checks so the decoder is more resilient against errors
patch by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
Originally committed as revision 3457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-13 03:27:53 +00:00
Michael Niedermayer
9dac77a7aa
argh
...
Originally committed as revision 3347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-26 16:49:00 +00:00
Chris Flerackers
7344c87aa9
- Support empty GOB's (no mb's) and skip all mb's
...
- Mb's were not skipped at the end of a GOB
- One value too much was used in iDCT
- Chroma_qscale was not updated for mquant
patch by ("Chris Flerackers" <cflerackers at androme dot be>)
Originally committed as revision 3332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-22 10:23:28 +00:00