ffmpeg.git
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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

7 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>
7 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>
7 years agoshowwaves: fix PTS computation.
Nicolas George [Sat, 23 Jun 2012 10:03:00 +0000 (12:03 +0200)]
showwaves: fix PTS computation.

7 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.

7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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()

7 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 *’

7 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

7 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.

7 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>
7 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>
7 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.

7 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()

7 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.

7 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>
7 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>
7 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.

7 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>
7 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>
7 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.

7 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.

7 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.

7 years agolavfi/audio: eliminate ff_default_filter_samples().
Anton Khirnov [Sun, 17 Jun 2012 08:09:54 +0000 (10:09 +0200)]
lavfi/audio: eliminate ff_default_filter_samples().

It currently does the following:
1) get a zeroed audio buffer
2) copy some properties (but not the data) of the input buffer to it
3) pass this buffer to the output filter
This looks useless and is indeed not used by any filters, therefore
delete it.

Make ff_null_filter_samples() (just pass the buffer to the next filter)
the new default.

7 years agoextend log line buffer sizes
Wolfram Gloger [Fri, 22 Jun 2012 16:15:09 +0000 (18:15 +0200)]
extend log line buffer sizes

The string passed to av_vlog() from libx264's X264_log overflows the 512
byte part_size, truncating x264 parameter output.  Double this size
and put it in a #define so it only needs to be changed in one place.

Signed-off-by: Wolfram Gloger <video06@malloc.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeexenc: add supported sample rates and channel layouts.
Anton Khirnov [Thu, 21 Jun 2012 07:19:23 +0000 (09:19 +0200)]
libspeexenc: add supported sample rates and channel layouts.

7 years agoReplace usleep() calls with av_usleep()
Mans Rullgard [Thu, 21 Jun 2012 19:31:44 +0000 (20:31 +0100)]
Replace usleep() calls with av_usleep()

This reduces the dependency on unistd.h which is not available
on all systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavu: add av_usleep() function
Mans Rullgard [Thu, 21 Jun 2012 16:00:25 +0000 (17:00 +0100)]
lavu: add av_usleep() function

This function implements a delay using the first available
of the following functions:

- nanosleep()
- usleep()
- Sleep() (Windows)

The conditional #includes in time.c are simplified by including
unistd.h and windows.h whenever they are available rather than
having these lines triggered by specific functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoutvideo: mark interlaced frames as such
Hendrik Leppkes [Thu, 21 Jun 2012 21:11:24 +0000 (21:11 +0000)]
utvideo: mark interlaced frames as such

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoutvideo: Fix interlaced prediction for RGB utvideo.
Carl Eugen Hoyos [Thu, 21 Jun 2012 21:11:23 +0000 (21:11 +0000)]
utvideo: Fix interlaced prediction for RGB utvideo.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agosnow: yuv410 support
Michael Niedermayer [Fri, 22 Jun 2012 14:13:15 +0000 (16:13 +0200)]
snow: yuv410 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/dsputil_mmx: support 4 sample edges
Michael Niedermayer [Fri, 22 Jun 2012 14:12:54 +0000 (16:12 +0200)]
x86/dsputil_mmx: support 4 sample edges

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "mathematics.h: remove a couple of math defines"
Carl Eugen Hoyos [Fri, 22 Jun 2012 14:10:42 +0000 (16:10 +0200)]
Revert "mathematics.h: remove a couple of math defines"

This reverts commit a2b186a188c126dd0402414d9e8198ec4df63ebe.

The defines were present for several years, removing
them without a version bump may break API.
(Fixes MPlayer compilation.)

7 years agoswresample: make .class_name more descriptive
Paul B Mahol [Fri, 22 Jun 2012 02:30:13 +0000 (02:30 +0000)]
swresample: make .class_name more descriptive

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosnow: yuv444 support
Michael Niedermayer [Fri, 22 Jun 2012 13:17:33 +0000 (15:17 +0200)]
snow: yuv444 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocosmetics: do not use full path for local headers
Diego Biurrun [Thu, 21 Jun 2012 09:44:53 +0000 (11:44 +0200)]
cosmetics: do not use full path for local headers

7 years agosnowenc: update pix_sum for rectangles, needed for non 420
Michael Niedermayer [Fri, 22 Jun 2012 01:58:43 +0000 (03:58 +0200)]
snowenc: update pix_sum for rectangles, needed for non 420

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: set chroma subsample factors correctly for non 420
Michael Niedermayer [Fri, 22 Jun 2012 01:58:07 +0000 (03:58 +0200)]
snowenc: set chroma subsample factors correctly for non 420

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: use designated initializers for AVClass
Paul B Mahol [Fri, 22 Jun 2012 02:34:34 +0000 (02:34 +0000)]
swscale: use designated initializers for AVClass

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffmpeg: print swr options in --help too
Michael Niedermayer [Fri, 22 Jun 2012 01:43:07 +0000 (03:43 +0200)]
ffmpeg: print swr options in --help too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add tests for SANM and VIMA
Paul B Mahol [Thu, 21 Jun 2012 14:08:41 +0000 (14:08 +0000)]
fate: add tests for SANM and VIMA

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavformat: offset fps calculation by one to include 60.00 fps
Hendrik Leppkes [Mon, 9 Apr 2012 16:54:42 +0000 (18:54 +0200)]
avformat: offset fps calculation by one to include 60.00 fps

To ensure the full range of values is still used, also adjust all uses of this function to loop from 0
instead of 1. This way only 60.00 is added and nothing lost.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/faq: Update video joining examples
Lou Logan [Thu, 21 Jun 2012 17:43:33 +0000 (09:43 -0800)]
doc/faq: Update video joining examples

-same_quant is not designed to convert between quantizer scales, AFAIK.

Add example using concat protocol.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/file: include unistd.h only when available
Mans Rullgard [Thu, 21 Jun 2012 15:54:02 +0000 (16:54 +0100)]
lavu/file: include unistd.h only when available

The unistd.h header is only needed for the close() declaration.
If this header is not available, the close() declaration may be
provided by another header, e.g. io.h.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: check for unistd.h
Mans Rullgard [Thu, 21 Jun 2012 15:34:10 +0000 (16:34 +0100)]
configure: check for unistd.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolog: include unistd.h only when needed
Mans Rullgard [Thu, 21 Jun 2012 15:33:36 +0000 (16:33 +0100)]
log: include unistd.h only when needed

The only symbol this file uses from unistd.h is isatty().  By
including the header only when this function is used, the file
can be built on systems without unistd.h (which presumably also
lack isatty).

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavf: include libavutil/time.h instead of redeclaring av_gettime()
Mans Rullgard [Thu, 21 Jun 2012 15:36:15 +0000 (16:36 +0100)]
lavf: include libavutil/time.h instead of redeclaring av_gettime()

This avoids some warnings about redundant declarations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 21 Jun 2012 19:57:39 +0000 (21:57 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fix hardcoded tables compililation caused by missing math constants
  lavf: Make codec_tag arrays constant
  twinvq: give massive struct a name.
  lavf, lavu: version bumps and APIchanges for av_gettime() move
  lavfi/audio: don't set cur_buf in ff_filter_samples().
  lavfi/fifo: add audio version of the fifo filter.
  fifo: fix parenthesis placement.
  lavfi: rename vf_fifo.c -> fifo.c
  lavc: remove stats_in from AVCodecContext options table.

Conflicts:
doc/APIchanges
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/audio.c
libavfilter/fifo.c
libavformat/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofix hardcoded tables compililation caused by missing math constants
Janne Grunau [Thu, 21 Jun 2012 15:59:56 +0000 (17:59 +0200)]
fix hardcoded tables compililation caused by missing math constants

Add -D_XOPEN_SOURCE=600 to host cflags to make the constants in math.h
available. Include math.h where necessary and remove redundant M_PI
defines.

7 years agosanm: silence warnings
Paul B Mahol [Thu, 21 Jun 2012 14:48:05 +0000 (14:48 +0000)]
sanm: silence warnings

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf: add a real SRT muxer.
Nicolas George [Sun, 17 Jun 2012 19:11:49 +0000 (21:11 +0200)]
lavf: add a real SRT muxer.

This muxer supports CODEC_ID_SRT with the timestamps in the packet data
and CODEC_ID_TEXT with the timestamps in the packet fields.

Makes -scodec copy work from Matroska.

7 years agovc1: signal interlaced and tff flag to the consumer
Hendrik Leppkes [Fri, 13 Jan 2012 21:14:36 +0000 (22:14 +0100)]
vc1: signal interlaced and tff flag to the consumer

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: add sanity check for length in smacker_decode_tree()
Michael Niedermayer [Thu, 21 Jun 2012 14:01:52 +0000 (16:01 +0200)]
smacker: add sanity check for length in smacker_decode_tree()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/lavfi: do not set the channel layout list.
Nicolas George [Thu, 21 Jun 2012 07:55:33 +0000 (09:55 +0200)]
lavd/lavfi: do not set the channel layout list.

The list was set to avfilter_all_channel_layouts,
which is really all common channel layouts.
Not setting it leaves an empty list,
which now means really all.

7 years agolavf: Make codec_tag arrays constant
Ronald S. Bultje [Wed, 20 Jun 2012 17:25:00 +0000 (10:25 -0700)]
lavf: Make codec_tag arrays constant

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoReplace Libav with FFmpeg
Paul B Mahol [Thu, 21 Jun 2012 11:36:30 +0000 (11:36 +0000)]
Replace Libav with FFmpeg

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosmush: set audio packet duration
Paul B Mahol [Thu, 21 Jun 2012 12:09:01 +0000 (12:09 +0000)]
smush: set audio packet duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/deshake: fix crash in uninit()
Stefano Sabatini [Thu, 21 Jun 2012 15:00:52 +0000 (17:00 +0200)]
lavfi/deshake: fix crash in uninit()

Add NULL check on avctx before calling avcodec_close() on it.

Fix trac ticket #1472.

7 years agotwinvq: give massive struct a name.
Ronald S. Bultje [Wed, 20 Jun 2012 17:11:43 +0000 (10:11 -0700)]
twinvq: give massive struct a name.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoaac: move sample_fmt selection before decoder configuration.
Hendrik Leppkes [Tue, 12 Jun 2012 08:05:29 +0000 (10:05 +0200)]
aac: move sample_fmt selection before decoder configuration.

The decoder configuration initializes the sbr mdct, which needs to know about the sample format to properly take the scale factor into account.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.
Hendrik Leppkes [Wed, 2 May 2012 14:34:45 +0000 (16:34 +0200)]
riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.

According to the specification on the MSDN [1], 0 is valid for that particular field, and it should be ignored in that case.

[1]: http://msdn.microsoft.com/en-us/library/windows/desktop/dd757714(v=vs.85).aspx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/scale: remove unused variable out_link
Stefano Sabatini [Thu, 21 Jun 2012 09:55:09 +0000 (11:55 +0200)]
lavfi/scale: remove unused variable out_link

Fix warning:
libavfilter/vf_scale.c: In function ‘start_frame’:
libavfilter/vf_scale.c:284:23: warning: unused variable ‘out_link’ [-Wunused-variable]

7 years agolavfi/audio: remove unused variable in ff_filter_samples()
Stefano Sabatini [Thu, 21 Jun 2012 09:53:10 +0000 (11:53 +0200)]
lavfi/audio: remove unused variable in ff_filter_samples()

Fix warning:
libavfilter/audio.c: In function ‘ff_filter_samples’:
libavfilter/audio.c:193:13: warning: unused variable ‘size’ [-Wunused-variable]

7 years agolswr/rematrix: specify explicitly the name of the unsupported channel layouts
Stefano Sabatini [Thu, 21 Jun 2012 09:53:50 +0000 (11:53 +0200)]
lswr/rematrix: specify explicitly the name of the unsupported channel layouts

Help debugging.

7 years agolavf, lavu: version bumps and APIchanges for av_gettime() move
Mans Rullgard [Wed, 20 Jun 2012 16:28:34 +0000 (17:28 +0100)]
lavf, lavu: version bumps and APIchanges for av_gettime() move

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavformat: add 48 fps to the NTSC framerates
Hendrik Leppkes [Mon, 9 Apr 2012 16:56:46 +0000 (18:56 +0200)]
avformat: add 48 fps to the NTSC framerates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideo: mark interlaced frames as such
Hendrik Leppkes [Tue, 3 Jan 2012 17:17:43 +0000 (18:17 +0100)]
utvideo: mark interlaced frames as such

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolagarith: frame multithreading
Hendrik Leppkes [Mon, 6 Feb 2012 17:04:51 +0000 (18:04 +0100)]
lagarith: frame multithreading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
Hendrik Leppkes [Fri, 16 Dec 2011 21:43:35 +0000 (22:43 +0100)]
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/ass: update use of deprecated functions, fix warnings
Stefano Sabatini [Thu, 21 Jun 2012 09:07:35 +0000 (11:07 +0200)]
lavfi/ass: update use of deprecated functions, fix warnings

7 years agolavfi/blackdetect: add logic for handling stream termination
Stefano Sabatini [Wed, 20 Jun 2012 23:15:52 +0000 (01:15 +0200)]
lavfi/blackdetect: add logic for handling stream termination

Add request_frame() which checks the black duration when the end of the
stream is signalled. Allow to detect black video segments at the end of
the stream.

Note that the reported last black video segment duration is not very
accurate, since we still miss the duration information in the video
buffer.

Address trac ticket #1470.

7 years agolavfi/blackdetect: fix pts time debug printing
Stefano Sabatini [Wed, 20 Jun 2012 22:57:53 +0000 (00:57 +0200)]
lavfi/blackdetect: fix pts time debug printing

7 years agolavfi/audio: don't set cur_buf in ff_filter_samples().
Anton Khirnov [Sun, 17 Jun 2012 08:21:49 +0000 (10:21 +0200)]
lavfi/audio: don't set cur_buf in ff_filter_samples().

It's redundant, since the input buffer is passed as a parameter to the
filter_samples() callback, and can lead to stale pointers remaining on
the link.

7 years agolavfi/fifo: add audio version of the fifo filter.
Anton Khirnov [Wed, 16 May 2012 06:21:47 +0000 (08:21 +0200)]
lavfi/fifo: add audio version of the fifo filter.

7 years agofifo: fix parenthesis placement.
Anton Khirnov [Sun, 27 May 2012 20:45:52 +0000 (22:45 +0200)]
fifo: fix parenthesis placement.

7 years agolavfi: rename vf_fifo.c -> fifo.c
Anton Khirnov [Wed, 16 May 2012 06:15:54 +0000 (08:15 +0200)]
lavfi: rename vf_fifo.c -> fifo.c

It will be used for audio too.

7 years agolavc: remove stats_in from AVCodecContext options table.
Anton Khirnov [Wed, 20 Jun 2012 16:36:14 +0000 (18:36 +0200)]
lavc: remove stats_in from AVCodecContext options table.

Its documentation states that it is allocated/freed by the caller, but
it is declared as an AV_OPT_TYPE_STRING AVOption. Since
367732832faaf1bac4ece37cf7fef8c911e16312 the AVOptions system frees
strings automatically. This can be considered an API break, since it
won't work when the caller doesn't use av_malloc() to allocate the
memory or wants to use the string after closing the codec.

Since there is not much value in this field being an AVOption, the best
solution is to remove it from the options table.

7 years agoLucasArts SMUSH demuxer
Paul B Mahol [Mon, 19 Mar 2012 02:55:26 +0000 (02:55 +0000)]
LucasArts SMUSH demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoLucasArts SMUSH video decoder
Paul B Mahol [Mon, 19 Mar 2012 02:54:19 +0000 (02:54 +0000)]
LucasArts SMUSH video decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoLucasArts SMUSH VIMA audio decoder
Paul B Mahol [Mon, 19 Mar 2012 02:52:08 +0000 (02:52 +0000)]
LucasArts SMUSH VIMA audio decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibavfilter/transform: fix mirroring.
Michael Niedermayer [Wed, 20 Jun 2012 21:48:26 +0000 (23:48 +0200)]
libavfilter/transform: fix mirroring.

mirror() borrowed from dwt.c, this could be moved to libavutil and made
public API, Ill submit a patch for this

Fixes Ticket1278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavutil: fix author attribution
Michael Niedermayer [Wed, 20 Jun 2012 19:28:03 +0000 (21:28 +0200)]
libavutil: fix author attribution

Libav.org has removed this while moving the code around

For reference, the code was originally added in:
commit 9aeeeb63f7e1ab7b0b7bb839a5f258667a2d2d78
Author: Fabrice Bellard <fabrice@bellard.org>
Date:   Wed Dec 20 00:02:47 2000 +0000

    Initial revision

    Originally committed as revision 2 to svn://svn.ffmpeg.org/ffmpeg/trunk
--
The function name originates from:
commit 949885313226f01ae7ba9a69eff5c45b47b78d57
Author: Fabrice Bellard <fabrice@bellard.org>
Date:   Thu Jul 25 16:01:46 2002 +0000

    more consistent naming

    Originally committed as revision 802 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocdxl: disable checked bitstream reader
Paul B Mahol [Sun, 17 Jun 2012 11:22:42 +0000 (11:22 +0000)]
cdxl: disable checked bitstream reader

Overreads should not be possible.

Signed-off-by: Paul B Mahol <onemda@gmail.com>