Michael Niedermayer
7b8ed831eb
jpegdec: actually search for and parse RSTn
...
Fixes Ticket267
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 03:35:50 +02:00
Etienne Buira
c8d0d8bc76
crypto: Use av_freep instead of av_free
...
This fixes a potential double free.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-09 02:43:55 +02:00
Michael Niedermayer
c1ad93c08c
Revert "crypto: fix potential double free"
...
This reverts commit 7d89f7cbf3
.
Revert at authors request, and its buggy missing &
2011-06-09 01:39:49 +02:00
Michael Niedermayer
1fe3bf3e4b
Revert "build: remove empty $(OBJS) target"
...
This reverts commit b9c6c7cb25
.
It appears this caused the .o files to be deletec under some circumstances.
2011-06-08 23:44:18 +02:00
Baptiste Coudurier
be20528ced
aac: fix adts frame size mask, fix demuxer probing for some files.
2011-06-08 13:12:18 -07:00
Mina Nagy Zaki
47d2ca3205
lavfi: handle NULL lists in avfilter_make_format_list
2011-06-08 18:50:07 +02:00
Carl Eugen Hoyos
9e4cb03a93
Fix "mixed declarations and code" warnings.
2011-06-08 16:38:37 +02:00
Michael Niedermayer
d552f616a2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (28 commits)
Remove some non-compiling debug messages.
ffplay: Fix non-compiling debug printf and replace it by av_dlog.
H264: x86 predict init cosmetics.
ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
Move E-AC-3 encoder functions to a separate eac3enc.c file.
ac3enc: remove convenience macro, #define DEBUG
ac3enc: remove unused #define
vc1: re-initialize tables after width/height change.
APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
samplefmt: add av_get_bytes_per_sample()
iirfilter: fix biquad filter coefficients.
swscale: remove duplicate conversion routine in swScale().
swscale: add yuv2planar/packed function typedefs.
swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
swscale: reindent x86 init code.
swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
swscale: cosmetics.
swscale: remove alp/chr/lumSrcOffset.
swscale: un-special-case yuv2yuvX16_c().
shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
...
Conflicts:
doc/APIchanges
libavcodec/ac3enc.c
libavutil/avutil.h
libavutil/samplefmt.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-08 05:25:28 +02:00
Etienne Buira
7d89f7cbf3
crypto: fix potential double free
2011-06-08 02:20:53 +02:00
Etienne Buira
1e9b302690
libx264: fix double free
2011-06-08 02:07:36 +02:00
Stefano Sabatini
8f2a2e6051
ffplay: remove -debug option
...
The options -loglevel LEVEL -debug FLAGS can be used for achieving the
same objectives, with a finer level of control.
2011-06-08 01:30:52 +02:00
Stefano Sabatini
e77a3095bd
ffplay: remove -vismv option
...
Use -vismv 1 instead. Simplify.
2011-06-08 01:30:52 +02:00
Stefano Sabatini
21bf6d7aab
mpegvideo: use av_get_picture_type_char() in ff_print_debug_info()
2011-06-08 01:30:52 +02:00
Diego Biurrun
ac4a854811
Remove some non-compiling debug messages.
2011-06-08 00:45:47 +02:00
Diego Biurrun
8543f0f923
ffplay: Fix non-compiling debug printf and replace it by av_dlog.
2011-06-08 00:45:25 +02:00
Daniel Kang
4de83b7b6d
H264: x86 predict init cosmetics.
...
Change indentation and whitespace; also move HAVE_YASM blocks.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-08 00:22:52 +02:00
Diego Biurrun
d3778972d8
ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
...
The AC-3 encoder unconditionally references some symbols from the E-AC-3
encoder; make those references conditional to fix linking.
2011-06-08 00:06:19 +02:00
Justin Ruggles
c8e9ea43d0
Move E-AC-3 encoder functions to a separate eac3enc.c file.
2011-06-07 15:16:41 -04:00
Justin Ruggles
787a13535a
ac3enc: remove convenience macro, #define DEBUG
2011-06-07 15:16:41 -04:00
Justin Ruggles
a8bd53402a
ac3enc: remove unused #define
2011-06-07 15:16:41 -04:00
John Stebbins
7b20d35a54
vc1: re-initialize tables after width/height change.
...
read_sequence_header can change width/height; therefore, re-initialize
all tables if width/height changed
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-07 19:55:02 +02:00
Justin Ruggles
1397ac0aa0
APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
2011-06-07 13:07:35 -04:00
Stefano Sabatini
a6703faa15
samplefmt: add av_get_bytes_per_sample()
...
Deprecate av_get_bits_per_sample_fmt(), which was a misnamed function.
For the moment we don't have sample formats with a non-integer number
of bytes, in that case we may need to create a new
av_get_bits_per_sample() function. In the meanwhile we prefer to adopt
this variant, since avoids divisions by 8 all over the place.
2011-06-07 13:06:41 -04:00
Michael Niedermayer
1929807bef
libvpxenc: add forgotten AVClass.
...
Fixes Ticket269
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 18:22:53 +02:00
Justin Ruggles
2f37321abc
iirfilter: fix biquad filter coefficients.
...
The current filter implementation should only have the cx coefficients
divided by gain in order to give the correct output scale.
2011-06-07 10:47:36 -04:00
Ronald S. Bultje
edeb56fa31
swscale: remove duplicate conversion routine in swScale().
2011-06-07 10:05:55 -04:00
Ronald S. Bultje
b73fe70025
swscale: add yuv2planar/packed function typedefs.
2011-06-07 10:05:55 -04:00
Ronald S. Bultje
df91d09174
swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
2011-06-07 10:05:54 -04:00
Ronald S. Bultje
0fb5193156
swscale: reindent x86 init code.
2011-06-07 10:05:50 -04:00
Ronald S. Bultje
ca364a5b43
swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
2011-06-07 10:03:47 -04:00
Ronald S. Bultje
b3b28b080f
swscale: cosmetics.
2011-06-07 10:03:46 -04:00
Ronald S. Bultje
ea28175312
swscale: remove alp/chr/lumSrcOffset.
...
They are hacks added to reuse the same scaling function for
different formats and they may cause problems when SIMD
implementation of the same functions are used along with pure
C functions.
2011-06-07 10:03:18 -04:00
Ronald S. Bultje
bda9b20fa4
swscale: un-special-case yuv2yuvX16_c().
...
Make yuv2yuvX16_c a function pointer for yuv2yuvX(), so that the
function pointer becomes bitdepth-independent.
2011-06-07 10:03:12 -04:00
Diego Biurrun
b9478cfefb
shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
2011-06-07 15:18:43 +02:00
Diego Biurrun
2d9570a304
vorbisdec: Restore mistakenly removed debug output.
2011-06-07 14:02:38 +02:00
Stefano Sabatini
3251af9037
v4l2: set default standard to NULL
...
It was errouneously changed to "NTSC" by the recent merge commit.
2011-06-07 13:37:55 +02:00
Michael Niedermayer
7a8228c05e
sws: make dither_scale const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 13:23:04 +02:00
Diego Biurrun
e8f6bd4b88
configure: Document --enable-vdpau.
...
The option is disabled by default, so enabling it should be documented.
2011-06-07 13:20:59 +02:00
Diego Biurrun
02a8d43adf
Replace some av_log/printf + #ifdef combinations by av_dlog.
2011-06-07 13:20:58 +02:00
Diego Biurrun
1f6b9cc31d
Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG.
2011-06-07 13:20:58 +02:00
Diego Biurrun
f8ea0eb6ff
svq1dec: Fix debug statements that referenced non-existing context.
2011-06-07 13:20:57 +02:00
Diego Biurrun
d7cf5639e7
Replace some printf instances in debug code by av_log.
2011-06-07 13:20:57 +02:00
Stefano Sabatini
4ae28eb853
showfiltfmts: use av_get_pix_fmt_name()
...
Use av_get_pix_fmt_name() rather than access
av_pix_fmt_descriptors. Improve readability.
2011-06-07 12:44:51 +02:00
Diego Biurrun
e01bb264e7
inverse.c: Replace unnecessary intmath.h header by necessary stdint.h.
2011-06-07 10:31:26 +02:00
Diego Biurrun
dc25d79f49
Drop unnecessary directory prefixes from #include directives.
2011-06-07 10:31:26 +02:00
Michael Niedermayer
40da61eff5
Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 04:43:03 +02:00
Michael Niedermayer
174df6affc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: remove empty $(OBJS) target
build: make rule for linking ff* apply only to these targets
build: rearrange some lines in a more logical way
s302m: fix resampling for 16 and 24bits.
ARM: remove MUL64 and MAC64 inline asm
build: clean up .PHONY lists
build: move all (un)install* target aliases to toplevel Makefile
flvenc: propagate error properly
build: remove stale dependency
build: do not add CFLAGS-yes to CFLAGS
utils.c: fix crash with threading enabled.
configure: simplify source_path setup
configure: remove --source-path option
lavf: deprecate AVFormatParameters.time_base.
img2: add framerate private option.
img2: add video_size private option.
img2: add pixel_format private option.
tty: add framerate private option.
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 03:37:57 +02:00
Michael Niedermayer
3a1aaf7b21
ffplay: Fix -vismv
...
Fixes Ticket164
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 03:17:42 +02:00
Michael Niedermayer
a39bd458a0
mem: Trying to workaround posix_memalign() bug on OSX
...
This patch is based on a patch by John Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 03:17:42 +02:00
Mans Rullgard
b9c6c7cb25
build: remove empty $(OBJS) target
...
This target was added to prevent some files being deleted
by make when using chains of implicit rules. This is no
longer required.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-07 01:28:40 +01:00