Michael Niedermayer
938adb7abc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dwt: K&R prettyprinting cosmetics
Remove libnut wrapper
fate: change name of FATE samples location environment variable
avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
http: Factorize the code by adding http_read_header()
Conflicts:
configure
doc/APIchanges
doc/fate.texi
libavcodec/dwt.c
libavcodec/dwt.h
libavformat/Makefile
libavformat/avformat.h
libavformat/libnut.c
libavformat/matroskaenc.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-05-21 23:53:39 +02:00
Jordi Ortiz
13a867a63e
dwt: K&R prettyprinting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2012-05-21 11:14:49 +02:00
Jordi Ortiz
4bb2b5afc9
dwt: removed some warnings in make checkheaders
...
(cherry picked from commit 1124056ac054842f36866b4dabb9f8aae0ad06b6)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-11-04 23:59:28 +01:00
multiple authors
5d50fcc549
DIRAC Decoder stable version, MMX support removed.
...
Look for MMX_DISABLED to find the disabled functions.
Authors of this code are Marco Gerards <marco@gnu.org > and David Conrad <lessen42@gmail.com >
With changes from Jordi Ortiz <nenjordi@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2011-10-30 21:50:08 +01: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 Elio Pettenò
e164553a82
Make ff_spatial_idwt_{init, slice} static to dwt.c
...
Both functions seem to be commanded by the ff_spatial_idwt function
instead.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net >
(cherry picked from commit ebb06d96ed )
2011-01-26 03:43:32 +01:00
Diego Elio Pettenò
ebb06d96ed
Make ff_spatial_idwt_{init, slice} static to dwt.c
...
Both functions seem to be commanded by the ff_spatial_idwt function
instead.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net >
2011-01-25 21:48:03 +01:00
Måns Rullgård
33996217ca
Add ff_ prefix to dwt functions
...
Originally committed as revision 22523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 17:50:16 +00:00
Måns Rullgård
05aec7bb87
Separate DWT from snow and dsputil
...
This moves the DWT functions from snow.c and dsputil.c to a file of
their own. A new struct, DWTContext, holds the function pointers
previously part of DSPContext.
Originally committed as revision 22522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 17:50:12 +00:00