ffmpeg.git
9 years agoffplay: pass frame durations clearly to video video_refresh
Marton Balint [Wed, 3 Aug 2011 22:59:45 +0000 (00:59 +0200)]
ffplay: pass frame durations clearly to video video_refresh

Previously the target clock of the next frame was calculated by using video_clock
which is modified from another thread...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 9 Aug 2011 14:32:39 +0000 (16:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Pretty-print RV3/4 decoder source
  Saner RV1/2 initialisation and RV2 header parsing.

Conflicts:
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agora288: avoid one multiply
Michael Niedermayer [Tue, 9 Aug 2011 13:08:20 +0000 (15:08 +0200)]
ra288: avoid one multiply

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoPretty-print RV3/4 decoder source
Kostya Shishkov [Tue, 9 Aug 2011 09:19:55 +0000 (11:19 +0200)]
Pretty-print RV3/4 decoder source

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years ago100l: fix parentheses placement when checking for ret < 0
Baptiste Coudurier [Tue, 9 Aug 2011 06:41:50 +0000 (23:41 -0700)]
100l: fix parentheses placement when checking for ret < 0

9 years agoSaner RV1/2 initialisation and RV2 header parsing.
Kostya Shishkov [Thu, 4 Aug 2011 19:00:12 +0000 (21:00 +0200)]
Saner RV1/2 initialisation and RV2 header parsing.

Old version was based on lots of guesswork which had different hacks based on
32-bit version field instead of splitting it into major/minor/micro version.
RV2 picture header parser also had a few places where it deviated from binary
decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoffmpeg: fix passlogfile regression
Carl Eugen Hoyos [Mon, 8 Aug 2011 23:05:28 +0000 (01:05 +0200)]
ffmpeg: fix passlogfile regression

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 8 Aug 2011 21:35:22 +0000 (23:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: do not set pic quality if no frame is output
  libx264: add preset, tune, profile and fastfirstpass private options

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibx264: do not set pic quality if no frame is output
Baptiste Coudurier [Sun, 30 Jan 2011 01:05:42 +0000 (17:05 -0800)]
libx264: do not set pic quality if no frame is output

Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolibx264: add preset, tune, profile and fastfirstpass private options
Baptiste Coudurier [Sat, 16 Apr 2011 23:50:50 +0000 (16:50 -0700)]
libx264: add preset, tune, profile and fastfirstpass private options

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavfi: remove gradfun mp wrapper
Stefano Sabatini [Thu, 4 Aug 2011 22:16:04 +0000 (00:16 +0200)]
lavfi: remove gradfun mp wrapper

The gradfun filter was already integrated natively in libavfilter.
Both filters issue the same output, and have a comparable performance.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: remove gradfun mp wrapper
Date: Fri,  5 Aug 2011 00:19:04 +0200

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 6 Aug 2011 22:32:11 +0000 (00:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: fix misspelling in comment
  aac: propagate error return values for AV_LOG_ERROR-triggering events

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: fix registration name for the buffersink sink
Stefano Sabatini [Sat, 6 Aug 2011 10:45:29 +0000 (12:45 +0200)]
lavfi: fix registration name for the buffersink sink

Previously both the buffer and buffersink elements were associated to
the "BUFFER" symbol in allfilters.c, so it was not possible to enable
one without the other.

9 years agolavfi: avoid void* arithmetic in defaults.c:set_common_formats()
Stefano Sabatini [Sat, 6 Aug 2011 10:42:02 +0000 (12:42 +0200)]
lavfi: avoid void* arithmetic in defaults.c:set_common_formats()

void* pointer arithmetic semantics is undefined, use uint8_t* instead.

Also fix GCC warnings:
defaults.c: In function ‘set_common_formats’:
defaults.c:184: warning: pointer of type ‘void *’ used in arithmetic
defaults.c:189: warning: pointer of type ‘void *’ used in arithmetic

9 years agolavfi: add asink_abuffer - audio buffer sink
Mina Nagy Zaki [Sat, 6 Aug 2011 10:30:33 +0000 (12:30 +0200)]
lavfi: add asink_abuffer - audio buffer sink

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agolavfi: fix doxygen doc for config_props() callback
Mina Nagy Zaki [Thu, 4 Aug 2011 12:47:01 +0000 (15:47 +0300)]
lavfi: fix doxygen doc for config_props() callback

Update/extend documentation related to the link fields to set, and fix
a pads->filters braino.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agolavfi: remove default config_props() callback and refactor avfilter_config_links()
Mina Nagy Zaki [Thu, 4 Aug 2011 12:47:00 +0000 (15:47 +0300)]
lavfi: remove default config_props() callback and refactor avfilter_config_links()

Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.

Also remove channel_layout check as it is now negotiated.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agolavfi: remove avfilter_default_config_input_link() declaration
Stefano Sabatini [Sat, 6 Aug 2011 10:11:12 +0000 (12:11 +0200)]
lavfi: remove avfilter_default_config_input_link() declaration

The function is not implemented (and possibly useless).

9 years agolavc: fix misspelling in comment
Dustin Brody [Sat, 6 Aug 2011 00:38:46 +0000 (20:38 -0400)]
lavc: fix misspelling in comment

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 5 Aug 2011 19:47:21 +0000 (21:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lsws: remove optimization debug logs in sws_init_context()
  lsws: use array for storing the supported in/out information

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaac: propagate error return values for AV_LOG_ERROR-triggering events
Dustin Brody [Fri, 5 Aug 2011 02:32:09 +0000 (22:32 -0400)]
aac: propagate error return values for AV_LOG_ERROR-triggering events

9 years agoffmpeg: Fix doxygen comments for MetadataMap
Michael Niedermayer [Thu, 4 Aug 2011 23:18:07 +0000 (01:18 +0200)]
ffmpeg: Fix doxygen comments for MetadataMap

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolsws: remove optimization debug logs in sws_init_context()
Stefano Sabatini [Thu, 4 Aug 2011 15:53:44 +0000 (17:53 +0200)]
lsws: remove optimization debug logs in sws_init_context()

The logged information is possibly false, and it tends to be outdated
after each change since the logging code needs to be manually updated.

Simplify and prevent confusing wrong debug messages.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agolsws: use array for storing the supported in/out information
Stefano Sabatini [Wed, 3 Aug 2011 23:34:49 +0000 (01:34 +0200)]
lsws: use array for storing the supported in/out information

Also remove the unnecessary isSupportedIn/Out macros.

Make the code more compact/readable, and simplify the access to
lsws-specific pixel format information.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agofilters.texi: fix wrong references in the "Filtergraph syntax" section
Stefano Sabatini [Thu, 4 Aug 2011 21:49:14 +0000 (23:49 +0200)]
filters.texi: fix wrong references in the "Filtergraph syntax" section

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 4 Aug 2011 18:59:29 +0000 (20:59 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoyadif: correct documentation on the parity parameter
Stefano Sabatini [Wed, 3 Aug 2011 22:25:35 +0000 (00:25 +0200)]
yadif: correct documentation on the parity parameter

0 is top-field-first, 1 is bottom-field-first, not the other way
around.

Fix trac issue #380.

9 years agompegvideo.h: remove the 1 line difference to qatar
Michael Niedermayer [Thu, 4 Aug 2011 15:04:14 +0000 (17:04 +0200)]
mpegvideo.h: remove the 1 line difference to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoapplehttp: fix variant discard logic
Luca Barbato [Wed, 3 Aug 2011 23:06:58 +0000 (01:06 +0200)]
applehttp: fix variant discard logic

The v->ctx is always not NULL now, check for streams presence to
mark the read_header state.

Fixes bug #25, possibly introduced by 603b8bc

9 years agoFix possible crash when decoding mpeg streams.
Carl Eugen Hoyos [Thu, 4 Aug 2011 09:06:43 +0000 (11:06 +0200)]
Fix possible crash when decoding mpeg streams.

This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7,
fixes ticket 329.

9 years agoh263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
Alex Converse [Thu, 4 Aug 2011 00:31:11 +0000 (17:31 -0700)]
h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 3 Aug 2011 23:40:29 +0000 (01:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
libavcodec/arm/ac3dsp_armv6.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavidec: skip seek pos adjustment for non interleaved files.
Michael Niedermayer [Wed, 3 Aug 2011 23:04:50 +0000 (01:04 +0200)]
avidec: skip seek pos adjustment for non interleaved files.
Fixes Ticket327

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolsws: remove deprecated and unused stuff after the 0->1 major bump
Stefano Sabatini [Thu, 28 Jul 2011 10:30:19 +0000 (12:30 +0200)]
lsws: remove deprecated and unused stuff after the 0->1 major bump

9 years agocosmetics: remove some stray comments from AVCodec declarations
Diego Biurrun [Wed, 3 Aug 2011 21:28:26 +0000 (23:28 +0200)]
cosmetics: remove some stray comments from AVCodec declarations

9 years agocosmetics: fix indentation/alignment in AVCodec declarations
Diego Biurrun [Wed, 3 Aug 2011 21:27:50 +0000 (23:27 +0200)]
cosmetics: fix indentation/alignment in AVCodec declarations

9 years agoAbort if command offset decreases, avoids potential endless loop.
Reimar Döffinger [Wed, 3 Aug 2011 18:09:53 +0000 (20:09 +0200)]
Abort if command offset decreases, avoids potential endless loop.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoWarn when falling back to unreliable UMF fps tag.
Reimar Döffinger [Wed, 3 Aug 2011 18:05:59 +0000 (20:05 +0200)]
Warn when falling back to unreliable UMF fps tag.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoDetect NI-avi at playtime like mplayer.
Michael Niedermayer [Wed, 3 Aug 2011 15:44:50 +0000 (17:44 +0200)]
Detect NI-avi at playtime like mplayer.
Fixes Ticket333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavidec: Fix XAN DPCM demuxing.
Michael Niedermayer [Wed, 3 Aug 2011 17:01:09 +0000 (19:01 +0200)]
avidec: Fix XAN DPCM demuxing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix a possible miscompilation of cabac with old (broken) compilers.
Carl Eugen Hoyos [Wed, 3 Aug 2011 11:09:42 +0000 (13:09 +0200)]
Fix a possible miscompilation of cabac with old (broken) compilers.

9 years agoFix -loop_input.
Carl Eugen Hoyos [Wed, 3 Aug 2011 09:45:02 +0000 (11:45 +0200)]
Fix -loop_input.

9 years agoSet bits_per_coded_sample when encoding ADPCM.
Carl Eugen Hoyos [Wed, 3 Aug 2011 09:42:33 +0000 (11:42 +0200)]
Set bits_per_coded_sample when encoding ADPCM.

9 years agovf_boxblur: call avfilter_draw_slice() at the end of draw_slice()
Stefano Sabatini [Tue, 2 Aug 2011 21:58:19 +0000 (23:58 +0200)]
vf_boxblur: call avfilter_draw_slice() at the end of draw_slice()

9 years agovf_boxblur: fix out-of-buffer access when h > w
Stefano Sabatini [Tue, 2 Aug 2011 22:01:41 +0000 (00:01 +0200)]
vf_boxblur: fix out-of-buffer access when h > w

Increase size of the private temporary buffers from w to FFMAX(w, h),
indeed they are used also for blurring vertical lines with length h.

9 years agovf_boxblur: prefer the name "len" over "w" in the blur routines
Stefano Sabatini [Tue, 2 Aug 2011 21:45:30 +0000 (23:45 +0200)]
vf_boxblur: prefer the name "len" over "w" in the blur routines

Make more clear the meaning of the variables. They specify the length
of a (vertical or horizontal) line rather than a width.
Less confusing.

9 years agoarm: Avoid using the movw instruction needlessly
Måns Rullgård [Mon, 1 Aug 2011 17:21:04 +0000 (20:21 +0300)]
arm: Avoid using the movw instruction needlessly

This fixes building for ARM11 without Thumb2.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMove an int64_t down in MpegEncContext
Martin Storsjö [Mon, 1 Aug 2011 14:18:13 +0000 (17:18 +0300)]
Move an int64_t down in MpegEncContext

This allows using the same arm assembler offsets for both EABI
and the mach-o ABI.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 2 Aug 2011 20:07:51 +0000 (22:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
  swscale: use 15-bit intermediates for 9/10-bit scaling.
  dct32: Add SSE2 ASM optimizations
  Correct chroma vector calculation for RealVideo 3.
  lavf: Add an option to discard corrupted frames
  mpegts: Mark wrongly-sized packets as corrupted
  mpegts: Move scan test to handle_packets
  mpegts: Mark corrupted packets
  mpegts: Reset continuity counter on seek
  mpegts: Fix for continuity counter
  mpegts: Silence "can't seek" warning on unseekable
  apichange: add an entry for AV_PKT_FLAG_CORRUPT
  avpacket: signal possibly corrupted packets
  mpeg4videodec: remove dead code that would have detected erroneous encoding
  aac: Remove some suspicious illegal memcpy()s from LTP.
  bink: Eliminate unnecessary shadow declaration.

Conflicts:
doc/APIchanges
libavcodec/version.h
libavformat/avformat.h
libavformat/options.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "swscale: use 15-bit intermediates for 9/10-bit scaling."
Ronald S. Bultje [Tue, 2 Aug 2011 19:27:43 +0000 (12:27 -0700)]
Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."

This reverts commit ac0fb5934893be554a44d2a1eb7a3bc7bf39da4a. It
causes valgrind errors which I'll want to investigate before
resubmitting this.

9 years agoswscale: use 15-bit intermediates for 9/10-bit scaling.
Ronald S. Bultje [Tue, 2 Aug 2011 04:04:19 +0000 (21:04 -0700)]
swscale: use 15-bit intermediates for 9/10-bit scaling.

9 years agodct32: Add SSE2 ASM optimizations
Vitor Sessak [Sat, 30 Jul 2011 16:39:25 +0000 (18:39 +0200)]
dct32: Add SSE2 ASM optimizations

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoCorrect chroma vector calculation for RealVideo 3.
Kostya Shishkov [Tue, 2 Aug 2011 11:45:28 +0000 (13:45 +0200)]
Correct chroma vector calculation for RealVideo 3.

Old version divided it wrong, which resulted in chroma drift (visible on FATE
sample too as dirty trails left by clouds).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agolavf: Add an option to discard corrupted frames
Zohar Kelrich [Sun, 24 Jul 2011 14:28:33 +0000 (17:28 +0300)]
lavf: Add an option to discard corrupted frames

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agompegts: Mark wrongly-sized packets as corrupted
Zohar Kelrich [Sun, 24 Jul 2011 08:13:51 +0000 (11:13 +0300)]
mpegts: Mark wrongly-sized packets as corrupted

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agompegts: Move scan test to handle_packets
Zohar Kelrich [Sun, 24 Jul 2011 08:13:50 +0000 (11:13 +0300)]
mpegts: Move scan test to handle_packets

This fixes an issue where packets which start being read
while reading the header stick around after a seek.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agompegts: Mark corrupted packets
Zohar Kelrich [Sun, 24 Jul 2011 08:13:50 +0000 (11:13 +0300)]
mpegts: Mark corrupted packets

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agompegts: Reset continuity counter on seek
Zohar Kelrich [Sun, 24 Jul 2011 08:13:50 +0000 (11:13 +0300)]
mpegts: Reset continuity counter on seek

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agompegts: Fix for continuity counter
Zohar Kelrich [Sun, 24 Jul 2011 08:13:50 +0000 (11:13 +0300)]
mpegts: Fix for continuity counter

Make continuity counter respect discontinuity flag
and null packets. Unpack the adaptation_field_control field.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agompegts: Silence "can't seek" warning on unseekable
Zohar Kelrich [Sun, 24 Jul 2011 08:13:50 +0000 (11:13 +0300)]
mpegts: Silence "can't seek" warning on unseekable

Do not try to seek when we already know we are not allowed to.
Silences warning that always happens when streaming.

Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoapichange: add an entry for AV_PKT_FLAG_CORRUPT
Luca Barbato [Mon, 1 Aug 2011 15:46:29 +0000 (17:46 +0200)]
apichange: add an entry for AV_PKT_FLAG_CORRUPT

9 years agoavpacket: signal possibly corrupted packets
Luca Barbato [Mon, 1 Aug 2011 15:41:44 +0000 (17:41 +0200)]
avpacket: signal possibly corrupted packets

Use AV_PKT_FLAG_CORRUPT flag to mark packets that might be incomplete
or have errors. Formats that have a mean to validate their packets
should use this flag to deliver such information instead of silently
dropping the packets.

9 years agompeg4videodec: remove dead code that would have detected erroneous encoding
Dustin Brody [Thu, 28 Jul 2011 00:44:58 +0000 (20:44 -0400)]
mpeg4videodec: remove dead code that would have detected erroneous encoding

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoaac: Remove some suspicious illegal memcpy()s from LTP.
Alex Converse [Fri, 29 Jul 2011 22:49:11 +0000 (15:49 -0700)]
aac: Remove some suspicious illegal memcpy()s from LTP.

9 years agobink: Eliminate unnecessary shadow declaration.
Alex Converse [Fri, 29 Jul 2011 21:45:04 +0000 (14:45 -0700)]
bink: Eliminate unnecessary shadow declaration.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Aug 2011 16:24:31 +0000 (18:24 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
Not merged:  Remove the ffserver test.
  Remove ffserver.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocorrect shorthand ffmpeg-dev > ffmpeg-devel
Compn [Mon, 1 Aug 2011 13:55:54 +0000 (09:55 -0400)]
correct shorthand ffmpeg-dev > ffmpeg-devel

9 years agoRemove the ffserver test.
Anton Khirnov [Wed, 27 Jul 2011 18:29:32 +0000 (20:29 +0200)]
Remove the ffserver test.

It doesn't work and is therefore useless.

9 years agoRemove ffserver.h
Anton Khirnov [Tue, 26 Jul 2011 19:57:15 +0000 (21:57 +0200)]
Remove ffserver.h

It's unused an serves no purpose.

9 years agoRemove non-existing fourcc " Y8".
Carl Eugen Hoyos [Sun, 31 Jul 2011 23:26:55 +0000 (01:26 +0200)]
Remove non-existing fourcc " Y8".

This reverts a line of r1842.

9 years agoSupport FourCC DreX as MPEG4 ASP.
Carl Eugen Hoyos [Sun, 31 Jul 2011 23:23:39 +0000 (01:23 +0200)]
Support FourCC DreX as MPEG4 ASP.

9 years agoRm lavfi-showfiltfmts on make testclean.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:55:40 +0000 (00:55 +0200)]
Rm lavfi-showfiltfmts on make testclean.

9 years agoUnbreak ffplay -s and ffplay -pix_fmt.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:40:28 +0000 (00:40 +0200)]
Unbreak ffplay -s and ffplay -pix_fmt.

9 years agoDo not ignore opt_default() return values.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:36:52 +0000 (00:36 +0200)]
Do not ignore opt_default() return values.

9 years agoCosmetics: Restore alphabetical order.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:33:09 +0000 (00:33 +0200)]
Cosmetics: Restore alphabetical order.

9 years agoSupport muxing MP1, MP2 and MP3 in caf.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:30:56 +0000 (00:30 +0200)]
Support muxing MP1, MP2 and MP3 in caf.

9 years agoExplicitely fail for unsupported codecs when muxing caf.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:28:04 +0000 (00:28 +0200)]
Explicitely fail for unsupported codecs when muxing caf.

9 years agoUse av_get_bits_per_sample() for mBitsPerChannel in caf.
Carl Eugen Hoyos [Sun, 31 Jul 2011 22:23:07 +0000 (00:23 +0200)]
Use av_get_bits_per_sample() for mBitsPerChannel in caf.

9 years agoCosmetics: Fix indentation.
Naoya OYAMA [Sun, 31 Jul 2011 22:17:45 +0000 (00:17 +0200)]
Cosmetics: Fix indentation.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 31 Jul 2011 22:35:57 +0000 (00:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
Dustin Brody [Fri, 29 Jul 2011 07:25:34 +0000 (03:25 -0400)]
lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoLimit fsize before adding to pointer.
Reimar Döffinger [Sat, 30 Jul 2011 09:45:15 +0000 (11:45 +0200)]
Limit fsize before adding to pointer.

This avoids a theoretically possible pointer arithmetic overflow
which would lead to a crash due to reading from NULL page.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agox11grab: add show_region AVOption.
Yu-Jie Lin [Sat, 30 Jul 2011 11:13:43 +0000 (19:13 +0800)]
x11grab: add show_region AVOption.

Draw the current grabbing region for indication.

Signed-off-by: Yu-Jie Lin <livibetter@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agox11grab: add follow_mouse AVOption.
Yu-Jie Lin [Sat, 30 Jul 2011 10:46:36 +0000 (18:46 +0800)]
x11grab: add follow_mouse AVOption.

-follow_mouse centered|PIXELS
  move grabbing region to where mouse pointer at the center; or
  only move when pointer reaches within PIXELS to the edge.

Signed-off-by: Yu-Jie Lin <livibetter@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Jul 2011 22:34:34 +0000 (00:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: make examples build normally

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDo not convert RGB buffer at once when stride does not fit exact samples.
Kostya Shishkov [Fri, 29 Jul 2011 10:55:01 +0000 (12:55 +0200)]
Do not convert RGB buffer at once when stride does not fit exact samples.

When converting RGB format to RGB format with the same bits per sample,
unscaled path performs conversion on the whole buffer at once. For
non-multiple-of-16 BGR24 to RGB24 conversion it means that padding at the
end of line will be converted too. Since it may be of arbitrary length
(e.g. 8 bytes), operating on the whole buffer produces obviously wrong
results.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agovf_pad: add an example employing the sar variable
Stefano Sabatini [Sat, 30 Jul 2011 16:23:24 +0000 (18:23 +0200)]
vf_pad: add an example employing the sar variable

9 years agoffplay: set input link sample aspect ratio in input_config_props()
Stefano Sabatini [Sat, 30 Jul 2011 16:15:08 +0000 (18:15 +0200)]
ffplay: set input link sample aspect ratio in input_config_props()

Allow sample_aspect_ratio information to be correctly propagated in
the filterchain.

9 years agovf_crop: add support for a, dar, sar, hsub, and vsub variables
Stefano Sabatini [Mon, 4 Jul 2011 11:28:37 +0000 (13:28 +0200)]
vf_crop: add support for a, dar, sar, hsub, and vsub variables

Consistent with the pad and scale filters.

9 years agolavfi: tweak display aspect ratio variables in pad and scale filters
Stefano Sabatini [Wed, 27 Jul 2011 08:58:24 +0000 (10:58 +0200)]
lavfi: tweak display aspect ratio variables in pad and scale filters

Previously, "dar" and "a" were documented like "input display aspect
ratio", but their actual value was "in_w/in_h".

In order to avoid to break scripts which rely on the "a" variable, the
patch keeps the same semantics but fixes the corresponding docs, and
fixes the semantics of the recently added "dar" variable, which
now correctly expresses the input Display Aspect Ratio value as
"(inw_w/in_h)*sar".

9 years agobuild: make examples build normally
Luca Barbato [Sat, 30 Jul 2011 09:01:17 +0000 (11:01 +0200)]
build: make examples build normally

The link target was missing $(EXAMPLES)

9 years agoRevert bink dequantization hack that is no longer necessary.
Reimar Döffinger [Sat, 30 Jul 2011 09:22:11 +0000 (11:22 +0200)]
Revert bink dequantization hack that is no longer necessary.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Jul 2011 04:39:57 +0000 (06:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
Alex Converse [Fri, 29 Jul 2011 22:27:36 +0000 (15:27 -0700)]
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.

This prevents out of bounds reads when extradata is being decoded.

9 years agoH.264: tweak some other x86 asm for Atom
Jason Garrett-Glaser [Thu, 28 Jul 2011 01:09:49 +0000 (18:09 -0700)]
H.264: tweak some other x86 asm for Atom

9 years agovf_transpose: avoid multiple calls to avfilter_draw_slice()
Stefano Sabatini [Fri, 29 Jul 2011 18:19:04 +0000 (20:19 +0200)]
vf_transpose: avoid multiple calls to avfilter_draw_slice()

avfilter_draw_slice() is already called in the end_frame() callback,
this avoids multiple calls. This is done by adding a null draw_slice()
callback.

In particular fix crash occurring with -vf transpose=3,hflip, fix trac
issue #371.

9 years agoprobe: Fix insane flow control.
Alex Converse [Fri, 29 Jul 2011 01:53:19 +0000 (18:53 -0700)]
probe: Fix insane flow control.

A loop control variable was shadowed inside the loop and never updated.

9 years agompegts: remove invalid error check
Mike Williams [Thu, 14 Jul 2011 20:49:21 +0000 (16:49 -0400)]
mpegts: remove invalid error check

mpegts_read_header is used by both mpegts and mpegtsraw, so this
erro check is no longer valid.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agos302m: use nondeprecated audio sample format API
Dustin Brody [Fri, 29 Jul 2011 06:36:11 +0000 (02:36 -0400)]
s302m: use nondeprecated audio sample format API

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavc: use designated initialisers for all codecs.
Anton Khirnov [Sun, 17 Jul 2011 10:54:31 +0000 (12:54 +0200)]
lavc: use designated initialisers for all codecs.

It's more readable and less prone to breakage.