Michael Niedermayer
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
Gabriel Dume
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15 03:18:18 -07:00
Daniel Kang
43c34675af
Check for invalid motion vector, fixes issue 2521.
...
Patch by Daniel Kang, daniel.d.kang at gmail
Originally committed as revision 26293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-10 10:28:06 +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
Stefano Sabatini
88c5216261
cosmetics: s/Id/id/ in libavcodec where Id refers to id Software.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 22:51:38 +00:00
Vitor Sessak
8448946e37
Remove more useless parentheses.
...
Originally committed as revision 9471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 03:01:53 +00:00
Vitor Sessak
737b7fb93e
Remove useless parentheses.
...
Originally committed as revision 9465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-03 02:52:40 +00:00
Vitor Sessak
35c621e753
use properly AVFrame.linesize
...
patch by Vitor: [vitor1001 gmail com]
Originally committed as revision 9458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-02 10:21:41 +00:00
Vitor Sessak
a7ae617fbd
use the right stride
...
patch by Vitor: [vitor1001 gmail com]
Originally committed as revision 9446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-27 10:40:29 +00:00
Vitor Sessak
7299663a50
right copyrights
...
patch by Vitor: [vitor1001 gmail com]
Originally committed as revision 9439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-26 20:13:09 +00:00
Vitor Sessak
9489d2ef3f
add width and height in context and use them
...
patch by Vitor: [vitor1001 gmail com]
Originally committed as revision 9438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-26 20:10:26 +00:00
Vitor Sessak
606975ab01
Fix typo
...
patch by Vitor: {vitor1001 gmail com}
Originally committed as revision 9419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-25 07:29:45 +00:00
Eric Lasota
3ccda4ca91
Convert RoQ decoder to use YUV 4:4:4 unpacked macroblocks
...
instead of packed 4:2:0 clusters
patch by Eric Lasota: \ riot icculus org /
original threads: [FFmpeg-devel] [PATCH] RoQ decoder 4:4:4 update
date: 06/04/2007 03:52 AM and 06/05/2007 01:10 AM
Originally committed as revision 9223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-05 08:05:16 +00:00
Vitor Sessak
55c970e349
Split RoQ decoder to accommodate future encoder patch
...
patch by Vitor vitor1001 gmail moc
original thread: [FFmpeg-devel] [PATCH] RoQ video encoder, take 2
date: 05/27/2007 12:21 PM
Originally committed as revision 9149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-29 15:01:33 +00:00
Vitor Sessak
750cbd34c9
cosmetics and function rename
...
patch by Vitor ken1001 gmail com | sed -e s/ken/vitor/
reference thread:
subject: [FFmpeg-devel] [PATCH] RoQ video encoder, take 2
date: 05/27/2007 12:21 PM
Originally committed as revision 9147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-29 12:20:40 +00:00
Ramiro Polla
67a5daf07f
Remove duplicate bytestream functions
...
Originally committed as revision 9108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-23 14:55:13 +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
Nicholas Tung
587d07227e
Remove superfluous setting of has_b_frames in codecs without B-frames.
...
patch by Nicholas Tung, ntung ntung com
Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 17:37:30 +00:00
Aurelien Jacobs
65a455a879
Use pointers to avoid copying AVFrame.
...
This ensure get_buffer() won't be confused with an AVFrame pointer
which looks like it wasn't released.
Originally committed as revision 8105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 00:55:50 +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
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
Mike Melanson
b9029997d4
tinfoil patch: validate motion vectors and do not free frame on exit if
...
frame is NULL; also removed some ancient MC code that did not perform
half-pel C-plane MC
Originally committed as revision 4514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-13 18:25:17 +00:00
Michael Niedermayer
53db1cae1c
data_size = 0 cleanup
...
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 14:37:16 +00:00
Michel Bardiaux
9b87956678
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 13:26:22 +00:00
Mike Melanson
ec59fd536f
experimental half-pel motion compensation for C planes, courtesy of Dr.
...
Tim
Originally committed as revision 2331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-02 04:19:56 +00:00
Mike Melanson
3ef8be2bfc
initial commit for Id RoQ and Interplay MVE multimedia subsystems
...
Originally committed as revision 2195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-02 04:32:02 +00: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