ffmpeg.git
6 years agobuffersink: group libav API functions.
Nicolas George [Sun, 24 Jun 2012 21:39:43 +0000 (23:39 +0200)]
buffersink: group libav API functions.

6 years agolavu/imgutils: create misc functions for dealing with buffers
Stefano Sabatini [Tue, 19 Jun 2012 00:45:36 +0000 (02:45 +0200)]
lavu/imgutils: create misc functions for dealing with buffers

Move the lavc/imgconvert functions and rename them as follows:
avpicture_get_size -> av_image_get_buffer_size()
avpicture_fill     -> av_image_fill_arrays()
avpicture_layout   -> av_image_copy_to_buffer()

The new functions have an align parameter, which allows to define the
linesize alignment assumed in the buffer (which is set or read).

The names of the functions are consistent with the lavu/samples API
(av_samples_get_buffer_size(), av_samples_fill_arrays()).

6 years agoRevert "x86: fft: convert sse inline asm to yasm"
Nicolas George [Tue, 26 Jun 2012 11:00:14 +0000 (13:00 +0200)]
Revert "x86: fft: convert sse inline asm to yasm"

This reverts commit 82992604706144910f4a2f875d48cfc66c1b70d7.

It breaks shared builds on x86_64.

6 years agoRevert "x86: fft: win64: fix stack alignment for memcpy() call"
Nicolas George [Tue, 26 Jun 2012 10:59:48 +0000 (12:59 +0200)]
Revert "x86: fft: win64: fix stack alignment for memcpy() call"

This reverts commit 8725da49a2090de05b4b2d05e33727f45cb9d970.

Necerrary to revert 82992604706144910f4a2f875d48cfc66c1b70d7.

6 years agoffplay: add configure_filtergraph() helper
Stefano Sabatini [Mon, 25 Jun 2012 19:29:56 +0000 (21:29 +0200)]
ffplay: add configure_filtergraph() helper

Will help factorization with the pending -af patch, and add some checks
missing in the original code.

6 years agolavfi: drop deprecated and disabled packing API
Stefano Sabatini [Mon, 25 Jun 2012 22:52:30 +0000 (00:52 +0200)]
lavfi: drop deprecated and disabled packing API

It was deprecated and removed after the recent 2->3 major bump.

6 years agolavfi: remove old video sink API
Stefano Sabatini [Mon, 25 Jun 2012 18:24:50 +0000 (20:24 +0200)]
lavfi: remove old video sink API

It was deprecated since a long time and removed after the 2->3 major
bump.

6 years agotools/graph2dot: make dot graph representation a bit more compact
Stefano Sabatini [Sun, 24 Jun 2012 20:53:53 +0000 (22:53 +0200)]
tools/graph2dot: make dot graph representation a bit more compact

6 years agoMake LucasArts Smush SANM palette opaque.
Carl Eugen Hoyos [Tue, 26 Jun 2012 07:52:10 +0000 (09:52 +0200)]
Make LucasArts Smush SANM palette opaque.

Reviewed-by: Paul B Mahol
6 years agoSignal MSS1 palette change.
Carl Eugen Hoyos [Tue, 26 Jun 2012 07:30:27 +0000 (09:30 +0200)]
Signal MSS1 palette change.

Reviewed-by: Paul B Mahol
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 25 Jun 2012 23:13:07 +0000 (01:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Include io.h on windows
  lavr: x86: merge some branches
  x86: cpu: whitespace (mostly) cosmetics
  x86: fft: win64: fix stack alignment for memcpy() call

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/intmath.h: Fix mull operand constraints
yang [Mon, 25 Jun 2012 22:53:47 +0000 (00:53 +0200)]
x86/intmath.h: Fix mull operand constraints

Fixes Ticket1466

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomss1: check number of free colours
Paul B Mahol [Mon, 25 Jun 2012 22:45:08 +0000 (22:45 +0000)]
mss1: check number of free colours

Prevents out of array write.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosonic: fix FPE
Michael Niedermayer [Mon, 25 Jun 2012 22:38:05 +0000 (00:38 +0200)]
sonic: fix FPE

Fixes Ticket1397

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_parser: use av_assert
Michael Niedermayer [Mon, 25 Jun 2012 19:12:22 +0000 (21:12 +0200)]
h264_parser: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_loopfilter: use av_assert
Michael Niedermayer [Mon, 25 Jun 2012 19:12:07 +0000 (21:12 +0200)]
h264_loopfilter: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/drawtext: use av_opt_free() to free private context
Stefano Sabatini [Mon, 25 Jun 2012 20:41:33 +0000 (22:41 +0200)]
lavfi/drawtext: use av_opt_free() to free private context

Simplify code.

6 years agolavfi/abuffer: increase logging level of the log showing initial parameters
Stefano Sabatini [Fri, 22 Jun 2012 09:39:27 +0000 (11:39 +0200)]
lavfi/abuffer: increase logging level of the log showing initial parameters

Also show them in a more parsable/consistent fashion.

6 years agolavfi/avfilter.h: reorganize headers disposition
Stefano Sabatini [Fri, 22 Jun 2012 11:04:22 +0000 (13:04 +0200)]
lavfi/avfilter.h: reorganize headers disposition

Group lavfi headers together, slightly improve readability.

6 years agolog: Include io.h on windows
Ronald S. Bultje [Sun, 24 Jun 2012 17:57:35 +0000 (20:57 +0300)]
log: Include io.h on windows

This is required for isatty, which exists on MSVC and is found by
configure, but is provided by io.h instead of unistd.h.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMake MSS1 palette opaque.
Carl Eugen Hoyos [Mon, 25 Jun 2012 19:16:06 +0000 (21:16 +0200)]
Make MSS1 palette opaque.

6 years agolavr: x86: merge some branches
Justin Ruggles [Mon, 25 Jun 2012 00:37:25 +0000 (20:37 -0400)]
lavr: x86: merge some branches

6 years agodoc/general: fix output
Paul B Mahol [Mon, 25 Jun 2012 17:36:57 +0000 (17:36 +0000)]
doc/general: fix output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agox86: cpu: whitespace (mostly) cosmetics
Mans Rullgard [Mon, 25 Jun 2012 12:43:32 +0000 (13:43 +0100)]
x86: cpu: whitespace (mostly) cosmetics

This adds whitespace around operators, aligns line continuation
backslashes, and breaks long lines.  Also fixes an ifdef halfway
through a statement.  The one line of duplication this saved is
not worth the ugliness.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 25 Jun 2012 14:55:31 +0000 (16:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Check the return value from gmtime
  x86: fft: convert sse inline asm to yasm
  x86: place some inline asm under #if HAVE_INLINE_ASM

Conflicts:
libavcodec/x86/fft_sse.c
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: fft: win64: fix stack alignment for memcpy() call
Mans Rullgard [Mon, 25 Jun 2012 13:33:24 +0000 (14:33 +0100)]
x86: fft: win64: fix stack alignment for memcpy() call

6 years agowtv: Check the return value from gmtime
Martin Storsjö [Sat, 23 Jun 2012 18:46:26 +0000 (21:46 +0300)]
wtv: Check the return value from gmtime

On MSVC, gmtime returns NULL for values outside of their supported
range (and these show up in our fate test). This doesn't seem
to affect the actual fate test result.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: fft: convert sse inline asm to yasm
Mans Rullgard [Sat, 23 Jun 2012 18:08:11 +0000 (19:08 +0100)]
x86: fft: convert sse inline asm to yasm

6 years agox86: place some inline asm under #if HAVE_INLINE_ASM
Ronald S. Bultje [Fri, 22 Jun 2012 17:46:52 +0000 (18:46 +0100)]
x86: place some inline asm under #if HAVE_INLINE_ASM

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoffplay: give more meaningful names to the buffersink instances
Stefano Sabatini [Fri, 22 Jun 2012 09:03:57 +0000 (11:03 +0200)]
ffplay: give more meaningful names to the buffersink instances

6 years agolavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API
Stefano Sabatini [Fri, 22 Jun 2012 09:56:55 +0000 (11:56 +0200)]
lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref API

Deprecate functions:
avfilter_fill_frame_from_buffer_ref
avfilter_fill_frame_from_audio_buffer_ref
avfilter_fill_frame_from_video_buffer_ref

and schedule to drop them at the next API major bump.

The function avfilter_copy_buf_props() should be used instead.

6 years agolavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h
Stefano Sabatini [Fri, 22 Jun 2012 10:59:29 +0000 (12:59 +0200)]
lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h

libavfilter API was designed in order to be clarly distinguished from the
libavcodec API, including avcodec.h in avfilter.h is not going to help to
stick to this principle.

The inclusion of libavutil/audioconvert.h in many files was required
because avcodec.h includes audioconvert.h.

libavfilter/avcodec.h is where the lavc/lavfi interface should be
entirely placed.

6 years agolavfi: move some FF_API_ definitions from avfilter.h to version.h
Stefano Sabatini [Fri, 22 Jun 2012 10:46:51 +0000 (12:46 +0200)]
lavfi: move some FF_API_ definitions from avfilter.h to version.h

version.h seems the right place for FF_API_ definitions.

6 years agovocenc: use new header from codec tag 4
Michael Niedermayer [Mon, 25 Jun 2012 01:38:29 +0000 (03:38 +0200)]
vocenc: use new header from codec tag 4

this matches sox and should fix ticket1119

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovocenc: change default codec to 16bit
Michael Niedermayer [Mon, 25 Jun 2012 01:34:40 +0000 (03:34 +0200)]
vocenc: change default codec to 16bit

Hardly anyone would want 8bit today, 16bit is a much more reasonable
default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovocenc: fix sample rate rounding direction
Michael Niedermayer [Mon, 25 Jun 2012 01:14:27 +0000 (03:14 +0200)]
vocenc: fix sample rate rounding direction

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Try to fix source path for fate-acodec-dca
Michael Niedermayer [Sun, 24 Jun 2012 23:58:18 +0000 (01:58 +0200)]
fate: Try to fix source path for fate-acodec-dca

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: speedup dnxhd tests and reduce their memory requirements
Michael Niedermayer [Sun, 24 Jun 2012 22:29:03 +0000 (00:29 +0200)]
fate: speedup dnxhd tests and reduce their memory requirements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxwdenc: support 8bpp grayscale
Paul B Mahol [Sun, 24 Jun 2012 11:42:14 +0000 (11:42 +0000)]
xwdenc: support 8bpp grayscale

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoxwddec: support 8bpp grayscale
Piotr Bandurski [Sun, 24 Jun 2012 11:34:02 +0000 (11:34 +0000)]
xwddec: support 8bpp grayscale

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Jun 2012 19:34:54 +0000 (21:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Only include unistd.h if configure found it
  ape: create audio stream before reading tags.
  mov: make a length variable larger.
  image2: Add "start_number" private option to the demuxer
  image2: Add "start_number" private option to the muxer
  avconv: remove a forgotten debugging printf.
  avconv: use more descriptive names for hardcoded filters.
  avconv: remove redundant handling of async.
  doc/filters: fix typo.
  h264: use asm cabac reader under a generic condition

Conflicts:
ffmpeg.c
libavformat/img2dec.c
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlp_parser: use av_assert
Michael Niedermayer [Sun, 24 Jun 2012 18:20:23 +0000 (20:20 +0200)]
mlp_parser: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorangecoder.h: use av_assert
Michael Niedermayer [Sun, 24 Jun 2012 18:18:00 +0000 (20:18 +0200)]
rangecoder.h: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix libavutil.pc generation
Michael Niedermayer [Sun, 24 Jun 2012 18:11:11 +0000 (20:11 +0200)]
configure: fix libavutil.pc generation

Found-by: uau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_aresample: fix sample_rate type.
Michael Niedermayer [Sun, 24 Jun 2012 13:13:39 +0000 (15:13 +0200)]
af_aresample: fix sample_rate type.

should fix fate failures on 32bit x86 linux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosink_buffer: assert that functions and sinks arent mixed
Michael Niedermayer [Sun, 24 Jun 2012 12:17:14 +0000 (14:17 +0200)]
sink_buffer: assert that functions and sinks arent mixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix indent of 1 line
Michael Niedermayer [Sun, 24 Jun 2012 12:16:34 +0000 (14:16 +0200)]
ffmpeg: fix indent of 1 line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/filtering_audio: update for avfilter API "cleanup"
Michael Niedermayer [Sun, 24 Jun 2012 12:15:53 +0000 (14:15 +0200)]
examples/filtering_audio: update for avfilter API "cleanup"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimage2: Add "start_number" private option to the demuxer
Mashiat Sarker Shakkhar [Sun, 24 Jun 2012 07:40:50 +0000 (13:40 +0600)]
image2: Add "start_number" private option to the demuxer

Currently if a pattern is given we search for up to the fifth file name in
that sequence. This option sets that limit to an arbitrary number.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocpu.h: include version.h for LIBAVUTIL_VERSION_MAJOR
Michael Niedermayer [Sun, 24 Jun 2012 01:04:11 +0000 (03:04 +0200)]
cpu.h: include version.h for LIBAVUTIL_VERSION_MAJOR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: split version info into version.h
Michael Niedermayer [Sun, 24 Jun 2012 01:03:51 +0000 (03:03 +0200)]
lavu: split version info into version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolog: Only include unistd.h if configure found it
Martin Storsjö [Sat, 23 Jun 2012 16:21:35 +0000 (19:21 +0300)]
log: Only include unistd.h if configure found it

MSVC has isatty (in io.h), but not unistd.h. (isatty isn't called
at all for windows, since there's a special case block for that.)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoape: create audio stream before reading tags.
Anton Khirnov [Fri, 22 Jun 2012 11:08:08 +0000 (13:08 +0200)]
ape: create audio stream before reading tags.

Tags may contain attached picture, which will be exported as video
streams.

This ensures that the audio stream is always the first.

6 years agomov: make a length variable larger.
Anton Khirnov [Thu, 21 Jun 2012 16:13:34 +0000 (18:13 +0200)]
mov: make a length variable larger.

Right now, it's uint16_t, but for itunes metadata a 32bit number is
stored in it.

6 years agoimage2: Add "start_number" private option to the demuxer
Mashiat Sarker Shakkhar [Sat, 23 Jun 2012 03:57:04 +0000 (09:57 +0600)]
image2: Add "start_number" private option to the demuxer

Currently if a pattern is given we look for up to the fifth file name in
the sequence. This option sets that limit to an arbitrary number.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoimage2: Add "start_number" private option to the muxer
Mashiat Sarker Shakkhar [Sat, 23 Jun 2012 03:53:43 +0000 (09:53 +0600)]
image2: Add "start_number" private option to the muxer

This adds the capability to start counting file number from an arbitrary
integer.

This includes a few lines of trivial code from FFmpeg codebase.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavconv: remove a forgotten debugging printf.
Anton Khirnov [Sat, 23 Jun 2012 14:10:08 +0000 (16:10 +0200)]
avconv: remove a forgotten debugging printf.

6 years agoavconv: use more descriptive names for hardcoded filters.
Anton Khirnov [Sat, 23 Jun 2012 14:08:24 +0000 (16:08 +0200)]
avconv: use more descriptive names for hardcoded filters.

Also ensure that all such filters get a non-NULL name. Should fix FATE
failures on some architectures after
58b049f2fa4f192b00baadb5f1f32ca366f936ea.

6 years agoavconv: remove redundant handling of async.
Anton Khirnov [Sat, 23 Jun 2012 14:02:45 +0000 (16:02 +0200)]
avconv: remove redundant handling of async.

Because of a mistake during merging the code for simple and complex
filtergraphs, -async inserts an asyncts filter both on input and output.
Remove the output hunk.

6 years agodoc/filters: fix typo.
Anton Khirnov [Fri, 22 Jun 2012 21:01:03 +0000 (23:01 +0200)]
doc/filters: fix typo.

6 years agodxva2_h264: fix signaling of mbaff frames
Hendrik Leppkes [Mon, 27 Feb 2012 16:21:16 +0000 (17:21 +0100)]
dxva2_h264: fix signaling of mbaff frames

The MBAFF flag may only be signaled if we're actually dealing with
a full frame, and not singular fields, as it can happen in mixed content.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Jun 2012 00:09:53 +0000 (02:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Only use optimizations with cmov if the CPU supports the instruction
  x86: Add CPU flag for the i686 cmov instruction
  x86: remove unused inline asm macros from dsputil_mmx.h
  x86: move some inline asm macros to the only places they are used
  lavfi: Add the af_channelmap audio channel mapping filter.
  lavfi: add join audio filter.
  lavfi: allow audio filters to request a given number of samples.
  lavfi: support automatically inserting the fifo filter when needed.
  lavfi/audio: eliminate ff_default_filter_samples().

Conflicts:
Changelog
libavcodec/x86/h264dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/version.h
libavutil/x86/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix FF_API_OLD_VSINK_API=0 case
Michael Niedermayer [Sun, 24 Jun 2012 00:03:01 +0000 (02:03 +0200)]
ffmpeg: fix FF_API_OLD_VSINK_API=0 case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix mixup of old and new sinks
Michael Niedermayer [Sun, 24 Jun 2012 00:03:49 +0000 (02:03 +0200)]
ffmpeg: fix mixup of old and new sinks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: use asm cabac reader under a generic condition
Mans Rullgard [Fri, 22 Jun 2012 17:52:27 +0000 (18:52 +0100)]
h264: use asm cabac reader under a generic condition

This removes a dependency on implementation details from generic
code and allows easy addition of the equivalent optimisation for
other architectures than x86.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agosnow.h: use av_assert
Michael Niedermayer [Sat, 23 Jun 2012 19:09:21 +0000 (21:09 +0200)]
snow.h: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnow.c: use av_assert
Michael Niedermayer [Sat, 23 Jun 2012 19:09:13 +0000 (21:09 +0200)]
snow.c: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimage2: Add "start_number" private option to the muxer
Mashiat Sarker Shakkhar [Sat, 23 Jun 2012 04:11:49 +0000 (10:11 +0600)]
image2: Add "start_number" private option to the muxer

This adds the capability to start counting file number from an arbitrary
integer instead of always starting at 1.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: Only use optimizations with cmov if the CPU supports the instruction
Diego Biurrun [Tue, 19 Jun 2012 10:55:10 +0000 (12:55 +0200)]
x86: Only use optimizations with cmov if the CPU supports the instruction

6 years agox86: Add CPU flag for the i686 cmov instruction
Diego Biurrun [Tue, 19 Jun 2012 20:55:26 +0000 (22:55 +0200)]
x86: Add CPU flag for the i686 cmov instruction

6 years agox86: remove unused inline asm macros from dsputil_mmx.h
Mans Rullgard [Fri, 22 Jun 2012 21:11:02 +0000 (22:11 +0100)]
x86: remove unused inline asm macros from dsputil_mmx.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: move some inline asm macros to the only places they are used
Mans Rullgard [Fri, 22 Jun 2012 21:10:31 +0000 (22:10 +0100)]
x86: move some inline asm macros to the only places they are used

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoshowwaves: fix PTS computation.
Nicolas George [Sat, 23 Jun 2012 10:03:00 +0000 (12:03 +0200)]
showwaves: fix PTS computation.

6 years agoshowwaves: fix first sample of frame test.
Nicolas George [Sat, 23 Jun 2012 09:50:19 +0000 (11:50 +0200)]
showwaves: fix first sample of frame test.

Avoids a huge memleak when n != 1.

6 years agolavfi: display pad type with mismatch error message.
Nicolas George [Sat, 23 Jun 2012 09:34:46 +0000 (11:34 +0200)]
lavfi: display pad type with mismatch error message.

6 years agolavc: use designated initializers for AVClasses
Paul B Mahol [Fri, 22 Jun 2012 23:32:42 +0000 (23:32 +0000)]
lavc: use designated initializers for AVClasses

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibschroedingerdec: remove unused header
Paul B Mahol [Fri, 22 Jun 2012 22:58:56 +0000 (22:58 +0000)]
libschroedingerdec: remove unused header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomjpegenc: enable frame multithreading encoder
Michael Niedermayer [Thu, 14 Jun 2012 19:20:23 +0000 (21:20 +0200)]
mjpegenc: enable frame multithreading encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: add frame multithreading capability (currently intra only)
Michael Niedermayer [Thu, 14 Jun 2012 19:19:02 +0000 (21:19 +0200)]
lavc: add frame multithreading capability (currently intra only)

Compared to the decoder side, this code is able to change both the
delay and the number of threads seamlessly during encoding. Also
any idle thread can pick up tasks, the strict round robin in order
limit is gone too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agothreads: make get_logical_cpus() available outside pthread.c
Michael Niedermayer [Thu, 14 Jun 2012 19:11:05 +0000 (21:11 +0200)]
threads: make get_logical_cpus() available outside pthread.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegenc: mark as intra only
Michael Niedermayer [Thu, 14 Jun 2012 19:12:57 +0000 (21:12 +0200)]
mjpegenc: mark as intra only

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: add intra only codec flag
Michael Niedermayer [Thu, 14 Jun 2012 19:10:33 +0000 (21:10 +0200)]
lavc: add intra only codec flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobmpenc: use av_assert()
Paul B Mahol [Fri, 22 Jun 2012 21:30:17 +0000 (21:30 +0000)]
bmpenc: use av_assert()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/buffer: remove unused function av_vsrc_buffer_add_frame_alt()
Stefano Sabatini [Fri, 22 Jun 2012 09:41:14 +0000 (11:41 +0200)]
lavfi/buffer: remove unused function av_vsrc_buffer_add_frame_alt()

6 years agoffplay: add cast to fix warning in configure_video_filters()
Stefano Sabatini [Thu, 21 Jun 2012 16:32:40 +0000 (18:32 +0200)]
ffplay: add cast to fix warning in configure_video_filters()

Fix warning:
ffplay.c:1578:40: warning: passing argument 5 of ‘avfilter_graph_create_filter’ discards ‘const’ qualifier from pointer target type [enabled by default]
libavfilter/avfiltergraph.h:84:5: note: expected ‘void *’ but argument is of type ‘const enum PixelFormat *’

6 years agolavfi/buffer: apply misc consistency nits
Stefano Sabatini [Fri, 22 Jun 2012 09:36:50 +0000 (11:36 +0200)]
lavfi/buffer: apply misc consistency nits

6 years agolavc/pcm: clarify error message from pcm_decode_frame()
Stefano Sabatini [Fri, 22 Jun 2012 15:43:40 +0000 (17:43 +0200)]
lavc/pcm: clarify error message from pcm_decode_frame()

Extend/clarify an error message in case of invalid packet size, and
return a proper error message instead of -1.
Improve debuggability.

6 years agoff_snow_common_end: assert() that the last buffer freed differs from the current.
Michael Niedermayer [Fri, 22 Jun 2012 21:50:57 +0000 (23:50 +0200)]
ff_snow_common_end: assert() that the last buffer freed differs from the current.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocodec_release_buffer: fix handling of non user buffers
Michael Niedermayer [Fri, 22 Jun 2012 21:50:27 +0000 (23:50 +0200)]
codec_release_buffer: fix handling of non user buffers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: define macro AVFILTER_DEFINE_CLASS
Stefano Sabatini [Fri, 22 Jun 2012 12:33:09 +0000 (14:33 +0200)]
lavfi: define macro AVFILTER_DEFINE_CLASS

The macro can be used to define consistently the internal class of a
filter, save some typing and factorize.

6 years agolavfi/drawtext: remove unnecessary parentheses in init()
Stefano Sabatini [Fri, 22 Jun 2012 12:13:21 +0000 (14:13 +0200)]
lavfi/drawtext: remove unnecessary parentheses in init()

6 years agolavfi: Add the af_channelmap audio channel mapping filter.
Alex Converse [Sat, 9 Jun 2012 01:42:53 +0000 (18:42 -0700)]
lavfi: Add the af_channelmap audio channel mapping filter.

Inspired by MPlayer's af_channels filter and SoX's remix effect.

6 years agoqsort: flip compare direction to match libc qsort()
Michael Niedermayer [Fri, 22 Jun 2012 20:47:30 +0000 (22:47 +0200)]
qsort: flip compare direction to match libc qsort()

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Jun 2012 20:34:02 +0000 (22:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libspeexenc: add supported sample rates and channel layouts.
  Replace usleep() calls with av_usleep()
  lavu: add av_usleep() function
  utvideo: mark interlaced frames as such
  utvideo: Fix interlaced prediction for RGB utvideo.
  cosmetics: do not use full path for local headers
  lavu/file: include unistd.h only when available
  configure: check for unistd.h
  log: include unistd.h only when needed
  lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:
configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/utvideo.c
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: remove unused buffer_size in InputFile.
Clément Bœsch [Fri, 22 Jun 2012 20:11:20 +0000 (22:11 +0200)]
ffmpeg: remove unused buffer_size in InputFile.

6 years agoh.263enc: use av_assert
Michael Niedermayer [Fri, 22 Jun 2012 19:51:05 +0000 (21:51 +0200)]
h.263enc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh.263dec: use av_assert
Michael Niedermayer [Fri, 22 Jun 2012 19:50:50 +0000 (21:50 +0200)]
h.263dec: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add join audio filter.
Anton Khirnov [Mon, 28 May 2012 05:28:58 +0000 (07:28 +0200)]
lavfi: add join audio filter.

It joins multiple input streams into one multi-channel output.

6 years agolavfi: allow audio filters to request a given number of samples.
Anton Khirnov [Sun, 27 May 2012 12:18:49 +0000 (14:18 +0200)]
lavfi: allow audio filters to request a given number of samples.

This makes synchronization simpler for filters with multiple inputs.

6 years agolavfi: support automatically inserting the fifo filter when needed.
Anton Khirnov [Wed, 16 May 2012 07:19:46 +0000 (09:19 +0200)]
lavfi: support automatically inserting the fifo filter when needed.

This breaks libavfilter ABI.