]> git.sesse.net Git - ffmpeg/log
ffmpeg
13 years agolavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c
Stefano Sabatini [Sat, 12 Feb 2011 16:56:50 +0000 (17:56 +0100)]
lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c

Use avfilter_get_audio_buffer_ref_from_arrays() in
avfilter_default_get_audio_buffer(), simplify.

13 years agolavfi: implement avfilter_get_audio_buffer_ref_from_arrays()
Stefano Sabatini [Sun, 30 Jan 2011 23:07:41 +0000 (00:07 +0100)]
lavfi: implement avfilter_get_audio_buffer_ref_from_arrays()

13 years agoAPIchanges: remove duplicated entry
Stefano Sabatini [Fri, 10 Jun 2011 10:32:25 +0000 (12:32 +0200)]
APIchanges: remove duplicated entry

13 years agoAPIchanges: fill in dates and numbers
Stefano Sabatini [Fri, 10 Jun 2011 09:15:42 +0000 (11:15 +0200)]
APIchanges: fill in dates and numbers

Since some minor bump were not done, some entries present the same
libavutil minor (which represent the next bump after the corresponding
change).

13 years agoAPIchanges: remove duplicated entry
Stefano Sabatini [Fri, 10 Jun 2011 09:50:55 +0000 (11:50 +0200)]
APIchanges: remove duplicated entry

Remove duplicated entry regarding PIX_FMT_BGR48LE/BE formats.

13 years agoAPIchanges: correctly interleave entries
Stefano Sabatini [Fri, 10 Jun 2011 09:08:55 +0000 (11:08 +0200)]
APIchanges: correctly interleave entries

13 years agoAPIchanges: add entry for av_force_cpu_flags() addition
Stefano Sabatini [Fri, 10 Jun 2011 09:06:55 +0000 (11:06 +0200)]
APIchanges: add entry for av_force_cpu_flags() addition

13 years agolavf: bump minor after the addition of fps_probe_size to AVFormatContext
Stefano Sabatini [Fri, 10 Jun 2011 09:54:54 +0000 (11:54 +0200)]
lavf: bump minor after the addition of fps_probe_size to AVFormatContext

13 years agolavc: bump minor after the addition of AVCodecContext.request_sample_fmt
Stefano Sabatini [Fri, 10 Jun 2011 09:24:04 +0000 (11:24 +0200)]
lavc: bump minor after the addition of AVCodecContext.request_sample_fmt

13 years agoac3: there was no libav in 2010 thus this code cannot be from libav.
Michael Niedermayer [Fri, 10 Jun 2011 02:54:30 +0000 (04:54 +0200)]
ac3: there was no libav in 2010 thus this code cannot be from  libav.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Jun 2011 01:54:27 +0000 (03:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: make compute_pkt_fields2() return meaningful error values
  matroskadec: set timestamps for RealAudio packets.
  intelh263dec: aspect ratio processing fix.
  intelh263dec: fix "Strict H.263 compliance"  file playback
  oss,sndio: simplify by using FFMIN.
  swscale: extract monowhite/black output from yuv2packed[12X]_c().
  swscale: de-macro'ify RGB15/16/32 input functions.
  swscale: rearrange code.
  movdec: Add support for the 'wfex' atom.
  ffmpeg.c: Add a necessary const qualifier
  riff: Fix potential memleak.
  swscale: change 48bit RGB input macros to inline functions.
  swscale: change 9/10bit YUV input macros to inline functions.
  swscale: extract gray16 output functions from yuv2packed[12X]().
  swscale: use standard clipping functions.
  swscale: merge macros that are used only once.
  swscale: fix function declarations in swscale.c.
  swscale: fix function declaration keywords in x86/swscale_template.c.

Conflicts:
ffmpeg.c
libavcodec/intelh263dec.c
libswscale/swscale.c
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agodict: This code was developed in ffmpeg and not libav, nor by libav developers.
Michael Niedermayer [Thu, 9 Jun 2011 22:19:25 +0000 (00:19 +0200)]
dict: This code was developed in ffmpeg and not libav, nor by libav developers.
Correct copyright notices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agolavf: make compute_pkt_fields2() return meaningful error values
Stefano Sabatini [Tue, 15 Mar 2011 11:34:55 +0000 (12:34 +0100)]
lavf: make compute_pkt_fields2() return meaningful error values

Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agomatroskadec: set timestamps for RealAudio packets.
Reimar Döffinger [Sat, 26 Feb 2011 11:52:01 +0000 (12:52 +0100)]
matroskadec: set timestamps for RealAudio packets.

Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv

Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agointelh263dec: aspect ratio processing fix.
Anton Khirnov [Thu, 9 Jun 2011 20:36:31 +0000 (22:36 +0200)]
intelh263dec: aspect ratio processing fix.

patch submitted by xvid_fan freenet de

13 years agointelh263dec: fix "Strict H.263 compliance" file playback
Anton Khirnov [Thu, 9 Jun 2011 20:29:40 +0000 (22:29 +0200)]
intelh263dec: fix "Strict H.263 compliance"  file playback

fixes issue2449

patch submitted by xvid_fan freenet de

13 years agooss,sndio: simplify by using FFMIN.
Reimar Döffinger [Tue, 29 Mar 2011 18:18:45 +0000 (20:18 +0200)]
oss,sndio: simplify by using FFMIN.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years agoswscale: extract monowhite/black output from yuv2packed[12X]_c().
Ronald S. Bultje [Thu, 9 Jun 2011 20:25:21 +0000 (16:25 -0400)]
swscale: extract monowhite/black output from yuv2packed[12X]_c().

This is part of the Great Evil Plan to simplify swscale.

13 years agoswscale: de-macro'ify RGB15/16/32 input functions.
Ronald S. Bultje [Thu, 9 Jun 2011 17:59:21 +0000 (13:59 -0400)]
swscale: de-macro'ify RGB15/16/32 input functions.

Inline functions are easier to read, maintain, modify and test,
which justifies the slightly increased source size. This patch
also adds support for non-native endianness RGB15/16 and fixes
isSupportedOutput() to no longer claim that we support writing
non-native RGB565/555/444.

13 years agoswscale: rearrange code.
Ronald S. Bultje [Thu, 9 Jun 2011 14:00:09 +0000 (10:00 -0400)]
swscale: rearrange code.

This way the code in the file is less cluttered all-over-the-
place.

13 years agomovdec: Add support for the 'wfex' atom.
Alex Converse [Mon, 6 Jun 2011 17:59:46 +0000 (10:59 -0700)]
movdec: Add support for the 'wfex' atom.

The 'wfex' is just a Microsoft WaveFormatEx struct.

13 years agoffmpeg.c: Add a necessary const qualifier
Alex Converse [Thu, 9 Jun 2011 16:52:47 +0000 (09:52 -0700)]
ffmpeg.c: Add a necessary const qualifier

13 years agoriff: Fix potential memleak.
Alex Converse [Thu, 9 Jun 2011 16:50:38 +0000 (09:50 -0700)]
riff: Fix potential memleak.

Make ff_get_wav_header() free existing extradata before allocing a new
buffer.

13 years agoswscale: change 48bit RGB input macros to inline functions.
Ronald S. Bultje [Wed, 8 Jun 2011 19:12:32 +0000 (15:12 -0400)]
swscale: change 48bit RGB input macros to inline functions.

Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.

13 years agoswscale: change 9/10bit YUV input macros to inline functions.
Ronald S. Bultje [Wed, 8 Jun 2011 18:50:49 +0000 (14:50 -0400)]
swscale: change 9/10bit YUV input macros to inline functions.

Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.

13 years agoswscale: extract gray16 output functions from yuv2packed[12X]().
Ronald S. Bultje [Wed, 8 Jun 2011 17:29:09 +0000 (13:29 -0400)]
swscale: extract gray16 output functions from yuv2packed[12X]().

This is part of the Great Evil Plan to simplify swscale.

13 years agoswscale: use standard clipping functions.
Ronald S. Bultje [Tue, 7 Jun 2011 15:22:54 +0000 (11:22 -0400)]
swscale: use standard clipping functions.

This generates better code on some non-x86 architectures.

13 years agoswscale: merge macros that are used only once.
Ronald S. Bultje [Tue, 7 Jun 2011 15:06:44 +0000 (11:06 -0400)]
swscale: merge macros that are used only once.

This reduces source code size without affecting the binary.

13 years agoswscale: fix function declarations in swscale.c.
Ronald S. Bultje [Wed, 8 Jun 2011 16:31:11 +0000 (12:31 -0400)]
swscale: fix function declarations in swscale.c.

Remove inline keyword from functions that are never inlined.
Use av_always_inline for functions that should be force-inlined
for performance reasons. Use av_cold for init functions.

13 years agoswscale: fix function declaration keywords in x86/swscale_template.c.
Ronald S. Bultje [Wed, 8 Jun 2011 16:12:50 +0000 (12:12 -0400)]
swscale: fix function declaration keywords in x86/swscale_template.c.

Remove inline keyword for functions that are only called through
their function pointers (and thus cannot be inlined); add av_cold
keyword to init function, and use av_always_inline instead of
inline for functions that must be inlined for performance reasons.

13 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 Jun 2011 02:47:19 +0000 (04:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
doc/APIchanges
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/cafdec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/wtv.c
libavutil/avutil.h
libavutil/internal.h
libswscale/swscale.c
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agojpegdec: actually search for and parse RSTn
Michael Niedermayer [Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)]
jpegdec: actually search for and parse RSTn

Fixes Ticket267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agocrypto: Use av_freep instead of av_free
Etienne Buira [Wed, 8 Jun 2011 00:20:53 +0000 (02:20 +0200)]
crypto: Use av_freep instead of av_free

This fixes a potential double free.

Signed-off-by: Martin Storsjö <martin@martin.st>
13 years agoRevert "crypto: fix potential double free"
Michael Niedermayer [Wed, 8 Jun 2011 23:39:49 +0000 (01:39 +0200)]
Revert "crypto: fix potential double free"

This reverts commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a.

Revert at authors request, and its buggy missing &

13 years agoRevert "build: remove empty $(OBJS) target"
Michael Niedermayer [Wed, 8 Jun 2011 14:14:40 +0000 (16:14 +0200)]
Revert "build: remove empty $(OBJS) target"

This reverts commit b9c6c7cb25932b594fd684a0cb553e439d49fe12.
It appears this caused the .o files to be deletec under some circumstances.

13 years agocrypto: Use av_freep instead of av_free
Etienne Buira [Wed, 8 Jun 2011 00:20:53 +0000 (02:20 +0200)]
crypto: Use av_freep instead of av_free

This fixes a potential double free.

Signed-off-by: Martin Storsjö <martin@martin.st>
13 years agoaac: fix adts frame size mask, fix demuxer probing for some files.
Baptiste Coudurier [Tue, 7 Jun 2011 18:09:58 +0000 (11:09 -0700)]
aac: fix adts frame size mask, fix demuxer probing for some files.

13 years agolavf: don't try to free private options if priv_data is NULL.
Anton Khirnov [Mon, 6 Jun 2011 11:14:05 +0000 (13:14 +0200)]
lavf: don't try to free private options if priv_data is NULL.

This might happen if there was an error before priv_data was allocated
and result in segfault.

13 years agolavfi: handle NULL lists in avfilter_make_format_list
Mina Nagy Zaki [Tue, 7 Jun 2011 14:42:32 +0000 (17:42 +0300)]
lavfi: handle NULL lists in avfilter_make_format_list

13 years agoswscale: fix types of assembly arguments.
Ronald S. Bultje [Wed, 8 Jun 2011 15:39:26 +0000 (11:39 -0400)]
swscale: fix types of assembly arguments.

This prevents the following compiler warnings: "warning:
initialization from incompatible pointer type". Since the
variables are only ever used in inline assembly, their type
is actually irrelevant (so the part where it was wrong did
not invoke any buggy behaviour).

13 years agoswscale: move two macros that are only used once into caller.
Ronald S. Bultje [Wed, 8 Jun 2011 15:33:46 +0000 (11:33 -0400)]
swscale: move two macros that are only used once into caller.

This way, they look like regular code, which is easier to
understand.

13 years agoswscale: remove unused function.
Ronald S. Bultje [Wed, 8 Jun 2011 15:03:11 +0000 (11:03 -0400)]
swscale: remove unused function.

Use of this wrapper was removed in a previous patch, but I
forgot to actually remove the function itself.

13 years agoFix "mixed declarations and code" warnings.
Carl Eugen Hoyos [Wed, 8 Jun 2011 14:38:37 +0000 (16:38 +0200)]
Fix "mixed declarations and code" warnings.

13 years agooptions: Add missing braces around struct initializer.
Diego Biurrun [Wed, 8 Jun 2011 12:59:47 +0000 (14:59 +0200)]
options: Add missing braces around struct initializer.

This fixes the warning:
libavformat/options.c:62:1: warning: missing braces around initializer [-Wmissing-braces]

13 years agomov: Remove leftover crufty debug statement with references to a local file.
Diego Biurrun [Sun, 5 Jun 2011 14:10:17 +0000 (16:10 +0200)]
mov: Remove leftover crufty debug statement with references to a local file.

13 years agodvbsubdec: Fix compilation of debug code.
Diego Biurrun [Mon, 6 Jun 2011 12:10:22 +0000 (14:10 +0200)]
dvbsubdec: Fix compilation of debug code.

13 years agoRemove all uses of now deprecated metadata functions.
Anton Khirnov [Sun, 22 May 2011 10:46:29 +0000 (12:46 +0200)]
Remove all uses of now deprecated metadata functions.

13 years agoMove metadata API from lavf to lavu.
Anton Khirnov [Sun, 22 May 2011 10:45:00 +0000 (12:45 +0200)]
Move metadata API from lavf to lavu.

Rename it to AVDictionary, since it will be used as such.  Tags
documentation and metadata conversion API is lavf-specific, so remains
there.

13 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 Jun 2011 01:56:36 +0000 (03:56 +0200)]
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>
13 years agocrypto: fix potential double free
Etienne Buira [Wed, 8 Jun 2011 00:20:53 +0000 (02:20 +0200)]
crypto: fix potential double free

13 years agolibx264: fix double free
Etienne Buira [Tue, 7 Jun 2011 20:14:18 +0000 (22:14 +0200)]
libx264: fix double free

13 years agoffplay: remove -debug option
Stefano Sabatini [Tue, 7 Jun 2011 23:28:11 +0000 (01:28 +0200)]
ffplay: remove -debug option

The options -loglevel LEVEL -debug FLAGS can be used for achieving the
same objectives, with a finer level of control.

13 years agoffplay: remove -vismv option
Stefano Sabatini [Tue, 7 Jun 2011 23:24:42 +0000 (01:24 +0200)]
ffplay: remove -vismv option

Use -vismv 1 instead. Simplify.

13 years agompegvideo: use av_get_picture_type_char() in ff_print_debug_info()
Stefano Sabatini [Sun, 8 May 2011 18:46:41 +0000 (20:46 +0200)]
mpegvideo: use av_get_picture_type_char() in ff_print_debug_info()

13 years agoRemove some non-compiling debug messages.
Diego Biurrun [Sun, 5 Jun 2011 13:53:34 +0000 (15:53 +0200)]
Remove some non-compiling debug messages.

13 years agoffplay: Fix non-compiling debug printf and replace it by av_dlog.
Diego Biurrun [Tue, 7 Jun 2011 22:41:12 +0000 (00:41 +0200)]
ffplay: Fix non-compiling debug printf and replace it by av_dlog.

13 years agoH264: x86 predict init cosmetics.
Daniel Kang [Tue, 7 Jun 2011 14:31:51 +0000 (10:31 -0400)]
H264: x86 predict init cosmetics.

Change indentation and whitespace; also move HAVE_YASM blocks.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
13 years agoac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
Diego Biurrun [Tue, 7 Jun 2011 22:06:19 +0000 (00:06 +0200)]
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.

13 years agoMove E-AC-3 encoder functions to a separate eac3enc.c file.
Justin Ruggles [Tue, 7 Jun 2011 16:47:09 +0000 (12:47 -0400)]
Move E-AC-3 encoder functions to a separate eac3enc.c file.

13 years agoac3enc: remove convenience macro, #define DEBUG
Justin Ruggles [Tue, 7 Jun 2011 15:50:38 +0000 (11:50 -0400)]
ac3enc: remove convenience macro, #define DEBUG

13 years agoac3enc: remove unused #define
Justin Ruggles [Tue, 7 Jun 2011 14:53:44 +0000 (10:53 -0400)]
ac3enc: remove unused #define

13 years agovc1: re-initialize tables after width/height change.
John Stebbins [Tue, 7 Jun 2011 17:53:31 +0000 (19:53 +0200)]
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>
13 years agoAPIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
Justin Ruggles [Tue, 7 Jun 2011 17:04:06 +0000 (13:04 -0400)]
APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition

13 years agosamplefmt: add av_get_bytes_per_sample()
Stefano Sabatini [Sun, 5 Jun 2011 23:14:50 +0000 (01:14 +0200)]
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.

13 years agolibvpxenc: add forgotten AVClass.
Michael Niedermayer [Tue, 7 Jun 2011 16:22:53 +0000 (18:22 +0200)]
libvpxenc: add forgotten AVClass.

Fixes Ticket269

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoiirfilter: fix biquad filter coefficients.
Justin Ruggles [Mon, 6 Jun 2011 21:10:11 +0000 (17:10 -0400)]
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.

13 years agoswscale: remove duplicate conversion routine in swScale().
Ronald S. Bultje [Mon, 6 Jun 2011 02:54:30 +0000 (22:54 -0400)]
swscale: remove duplicate conversion routine in swScale().

13 years agoswscale: add yuv2planar/packed function typedefs.
Ronald S. Bultje [Mon, 6 Jun 2011 02:31:11 +0000 (22:31 -0400)]
swscale: add yuv2planar/packed function typedefs.

13 years agoswscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
Ronald S. Bultje [Mon, 6 Jun 2011 02:27:45 +0000 (22:27 -0400)]
swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.

13 years agoswscale: reindent x86 init code.
Ronald S. Bultje [Mon, 6 Jun 2011 01:48:51 +0000 (21:48 -0400)]
swscale: reindent x86 init code.

13 years agoswscale: extract SWS_FULL_CHR_H_INT conditional into init code.
Ronald S. Bultje [Mon, 6 Jun 2011 01:46:16 +0000 (21:46 -0400)]
swscale: extract SWS_FULL_CHR_H_INT conditional into init code.

13 years agoswscale: cosmetics.
Ronald S. Bultje [Mon, 6 Jun 2011 01:40:04 +0000 (21:40 -0400)]
swscale: cosmetics.

13 years agoswscale: remove alp/chr/lumSrcOffset.
Ronald S. Bultje [Mon, 6 Jun 2011 01:37:59 +0000 (21:37 -0400)]
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.

13 years agoswscale: un-special-case yuv2yuvX16_c().
Ronald S. Bultje [Mon, 6 Jun 2011 01:15:44 +0000 (21:15 -0400)]
swscale: un-special-case yuv2yuvX16_c().

Make yuv2yuvX16_c a function pointer for yuv2yuvX(), so that the
function pointer becomes bitdepth-independent.

13 years agoshorten: Remove stray DEBUG #define and corresponding av_dlog statement.
Diego Biurrun [Tue, 7 Jun 2011 08:52:30 +0000 (10:52 +0200)]
shorten: Remove stray DEBUG #define and corresponding av_dlog statement.

13 years agovorbisdec: Restore mistakenly removed debug output.
Diego Biurrun [Tue, 7 Jun 2011 12:02:38 +0000 (14:02 +0200)]
vorbisdec: Restore mistakenly removed debug output.

13 years agov4l2: set default standard to NULL
Stefano Sabatini [Tue, 7 Jun 2011 11:36:06 +0000 (13:36 +0200)]
v4l2: set default standard to NULL

It was errouneously changed to "NTSC" by the recent merge commit.

13 years agosws: make dither_scale const
Michael Niedermayer [Tue, 7 Jun 2011 11:22:36 +0000 (13:22 +0200)]
sws: make dither_scale const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoconfigure: Document --enable-vdpau.
Diego Biurrun [Mon, 6 Jun 2011 11:32:37 +0000 (13:32 +0200)]
configure: Document --enable-vdpau.

The option is disabled by default, so enabling it should be documented.

13 years agoReplace some av_log/printf + #ifdef combinations by av_dlog.
Diego Biurrun [Sun, 5 Jun 2011 23:25:32 +0000 (01:25 +0200)]
Replace some av_log/printf + #ifdef combinations by av_dlog.

13 years agoReplace some nonstandard DEBUG_* preprocessor directives by plain DEBUG.
Diego Biurrun [Sun, 5 Jun 2011 22:53:31 +0000 (00:53 +0200)]
Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG.

13 years agosvq1dec: Fix debug statements that referenced non-existing context.
Diego Biurrun [Sun, 5 Jun 2011 22:52:28 +0000 (00:52 +0200)]
svq1dec: Fix debug statements that referenced non-existing context.

13 years agoReplace some printf instances in debug code by av_log.
Diego Biurrun [Sun, 5 Jun 2011 22:39:39 +0000 (00:39 +0200)]
Replace some printf instances in debug code by av_log.

13 years agoshowfiltfmts: use av_get_pix_fmt_name()
Stefano Sabatini [Tue, 7 Jun 2011 00:18:19 +0000 (02:18 +0200)]
showfiltfmts: use av_get_pix_fmt_name()

Use av_get_pix_fmt_name() rather than access
av_pix_fmt_descriptors. Improve readability.

13 years agoinverse.c: Replace unnecessary intmath.h header by necessary stdint.h.
Diego Biurrun [Sun, 5 Jun 2011 13:27:51 +0000 (15:27 +0200)]
inverse.c: Replace unnecessary intmath.h header by necessary stdint.h.

13 years agoDrop unnecessary directory prefixes from #include directives.
Diego Biurrun [Sat, 4 Jun 2011 23:28:22 +0000 (01:28 +0200)]
Drop unnecessary directory prefixes from #include directives.

13 years agoMakefile: critical build fix after the merge. make fate passed locally due to ffmpeg...
Michael Niedermayer [Tue, 7 Jun 2011 02:43:03 +0000 (04:43 +0200)]
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>
13 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 Jun 2011 01:37:57 +0000 (03:37 +0200)]
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>
13 years agoffplay: Fix -vismv
Michael Niedermayer [Tue, 7 Jun 2011 01:14:28 +0000 (03:14 +0200)]
ffplay: Fix -vismv

Fixes Ticket164

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agomem: Trying to workaround posix_memalign() bug on OSX
Michael Niedermayer [Mon, 6 Jun 2011 20:59:23 +0000 (22:59 +0200)]
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>
13 years agobuild: remove empty $(OBJS) target
Mans Rullgard [Mon, 6 Jun 2011 20:46:18 +0000 (21:46 +0100)]
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>
13 years agobuild: make rule for linking ff* apply only to these targets
Mans Rullgard [Mon, 6 Jun 2011 22:00:26 +0000 (23:00 +0100)]
build: make rule for linking ff* apply only to these targets

This ensures that the special link command using cmdutils.o
only applies to the targets it should.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoeval: add support for pow() function
Stefano Sabatini [Mon, 6 Jun 2011 13:00:25 +0000 (15:00 +0200)]
eval: add support for pow() function

It is a more search-friendly alternative to the ^ operator.

13 years agobuild: rearrange some lines in a more logical way
Mans Rullgard [Mon, 6 Jun 2011 18:57:10 +0000 (19:57 +0100)]
build: rearrange some lines in a more logical way

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agos302m: fix resampling for 16 and 24bits.
Baptiste Coudurier [Sat, 4 Jun 2011 12:36:30 +0000 (14:36 +0200)]
s302m: fix resampling for 16 and 24bits.

13 years agoARM: remove MUL64 and MAC64 inline asm
Mans Rullgard [Sun, 5 Jun 2011 12:44:28 +0000 (13:44 +0100)]
ARM: remove MUL64 and MAC64 inline asm

Current GCC versions know how to generate these instructions
properly and avoiding inline asm gives better code.  The MULH
function for ARMv5 uses the same instruction and is also not
needed any more.

The MLS64 macro remains since negating an input would normally
not be allowed as it would fail for INT_MIN.  In our uses, the
inputs never have this value and thus negating is safe.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agobuild: clean up .PHONY lists
Mans Rullgard [Sun, 5 Jun 2011 20:57:03 +0000 (21:57 +0100)]
build: clean up .PHONY lists

This removes nonexisting targets from phony lists and puts them
all in one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agobuild: move all (un)install* target aliases to toplevel Makefile
Mans Rullgard [Sun, 5 Jun 2011 20:52:32 +0000 (21:52 +0100)]
build: move all (un)install* target aliases to toplevel Makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoflvenc: propagate error properly
Luca Barbato [Mon, 6 Jun 2011 14:13:05 +0000 (09:13 -0500)]
flvenc: propagate error properly

avio_flush can fail, in particular when used with the rtmp/librtmp
protocol.

13 years agobuild: remove stale dependency
Mans Rullgard [Mon, 6 Jun 2011 12:21:05 +0000 (13:21 +0100)]
build: remove stale dependency

This dependency is implicitly covered elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>