ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 29 Aug 2012 16:13:00 +0000 (18:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: export filtered -lz flag in config.mak
  build: add separate setting for host linker
  configure: probe_cc: use separate variable for linker output flag
  x86: Always compile files with functions that are called unconditionally
  x86: mpegvideoenc: fix linking with --disable-mmx
  x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation

Conflicts:
Makefile
configure
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
Michael Niedermayer [Wed, 29 Aug 2012 15:46:10 +0000 (17:46 +0200)]
Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

* commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112':
  configure: support Bitrig OS
  yuv2rgb: handle line widths that are not a multiple of 4.
  graph2dot: Use the fallback getopt implementation if needed
  tools: Include io.h for open/read/write/close if unistd.h doesn't exist
  testprogs: Remove unused includes
  qt-faststart: Use other seek/tell functions on MSVC than on mingw
  ismindex: Include direct.h for _mkdir on windows
  sdp: Use static const char arrays instead of pointers to strings
  x86: avcodec: Drop silly "_mmx" suffixes from filenames
  x86: avcodec: Drop silly "_sse" suffixes from filenames
  sdp: Include profile-level-id for H264
  utvideoenc: use ff_huff_gen_len_table
  huffman: add ff_huff_gen_len_table
  cllc: simplify/fix swapped data buffer allocation.
  rtpdec_h264: Don't set the pixel format
  h264: Check that the codec isn't null before accessing it
  audio_frame_queue: Define af_queue_log_state before using it

Conflicts:
libavcodec/audio_frame_queue.c
libavcodec/h264.c
libavcodec/huffman.h
libavcodec/huffyuv.c
libavcodec/utvideoenc.c
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: protect calls to frame_thread_encoder by HAVE_THREADS
Michael Niedermayer [Wed, 29 Aug 2012 09:09:36 +0000 (11:09 +0200)]
lavc: protect calls to frame_thread_encoder by HAVE_THREADS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexr: fix decoding ZIP16 and height not multiple of 16
Paul B Mahol [Wed, 29 Aug 2012 09:12:42 +0000 (09:12 +0000)]
exr: fix decoding ZIP16 and height not multiple of 16

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoframe_thread_encoder: pass frame pict type and quality
Michael Niedermayer [Wed, 29 Aug 2012 02:26:59 +0000 (04:26 +0200)]
frame_thread_encoder: pass frame pict type and quality

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoframe_thread_encoder: pass private options
Michael Niedermayer [Wed, 29 Aug 2012 02:26:36 +0000 (04:26 +0200)]
frame_thread_encoder: pass private options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: export filtered -lz flag in config.mak
Mans Rullgard [Tue, 28 Aug 2012 15:24:09 +0000 (16:24 +0100)]
build: export filtered -lz flag in config.mak

This is needed to link tools/cws2fws using a linker with non-standard
command line syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agobuild: add separate setting for host linker
Mans Rullgard [Tue, 28 Aug 2012 12:02:35 +0000 (13:02 +0100)]
build: add separate setting for host linker

This adds new HOSTLD and related settings for host linker allowing
it to be different from HOSTCC.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: probe_cc: use separate variable for linker output flag
Mans Rullgard [Tue, 28 Aug 2012 11:50:09 +0000 (12:50 +0100)]
configure: probe_cc: use separate variable for linker output flag

Some tools use different command line syntax for specifying output
when compiling and linking.  To accomodate these, separate variables
must be used.  No currently supported compilers/linkers are affected
by the change.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoAdd 'timeout' option to UDP protocol
Andrey Utkin [Mon, 27 Aug 2012 13:31:09 +0000 (16:31 +0300)]
Add 'timeout' option to UDP protocol

This patch accepts 'timeout' option for input mode only. As far as i know, UDP output cannot introduce delays.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: Always compile files with functions that are called unconditionally
Diego Biurrun [Tue, 28 Aug 2012 15:47:39 +0000 (17:47 +0200)]
x86: Always compile files with functions that are called unconditionally

7 years agox86: mpegvideoenc: fix linking with --disable-mmx
Diego Biurrun [Tue, 28 Aug 2012 15:45:24 +0000 (17:45 +0200)]
x86: mpegvideoenc: fix linking with --disable-mmx

The optimized dct_quantize template functions reference optimized
fdct symbols, so these functions must only be enabled if the relevant
optimizations have been enabled by configure.

7 years agoconfigure: support Bitrig OS
Brad Smith [Mon, 27 Aug 2012 18:57:52 +0000 (14:57 -0400)]
configure: support Bitrig OS

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation
Diego Biurrun [Tue, 28 Aug 2012 15:37:54 +0000 (17:37 +0200)]
x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation

This avoids trouble if HAVE_ variables are used elsewhere in the file.

7 years agoAdd 'rw_timeout' into URLContext
Andrey Utkin [Mon, 27 Aug 2012 13:31:08 +0000 (16:31 +0300)]
Add 'rw_timeout' into URLContext

If set non-zero, limits duration of retry_transfer_wrapper() loop, thus
affects ffurl_read*(), ffurl_write()
Measured in microseconds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyuv2rgb: handle line widths that are not a multiple of 4.
Ronald S. Bultje [Tue, 28 Aug 2012 00:32:50 +0000 (17:32 -0700)]
yuv2rgb: handle line widths that are not a multiple of 4.

This introduces support for width%4==2 in addition to width%4==0. For
odd widths, some more checks are needed, since the current code always
handles two luma items in a row, thus there is a possibility of an
overread by one.

7 years agograph2dot: Use the fallback getopt implementation if needed
Martin Storsjö [Tue, 28 Aug 2012 16:35:39 +0000 (19:35 +0300)]
graph2dot: Use the fallback getopt implementation if needed

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotools: Include io.h for open/read/write/close if unistd.h doesn't exist
Martin Storsjö [Tue, 28 Aug 2012 19:54:43 +0000 (22:54 +0300)]
tools: Include io.h for open/read/write/close if unistd.h doesn't exist

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotestprogs: Remove unused includes
Martin Storsjö [Tue, 28 Aug 2012 19:44:31 +0000 (22:44 +0300)]
testprogs: Remove unused includes

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoqt-faststart: Use other seek/tell functions on MSVC than on mingw
Martin Storsjö [Tue, 28 Aug 2012 19:40:27 +0000 (22:40 +0300)]
qt-faststart: Use other seek/tell functions on MSVC than on mingw

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoismindex: Include direct.h for _mkdir on windows
Martin Storsjö [Tue, 28 Aug 2012 19:30:36 +0000 (22:30 +0300)]
ismindex: Include direct.h for _mkdir on windows

The Windows SDK in MSVC doesn't have mkdir, only _mkdir, and
MSDN says one should include direct.h to use it.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoffmpeg: count finished streams for last stats line.
Nicolas George [Tue, 28 Aug 2012 21:19:33 +0000 (23:19 +0200)]
ffmpeg: count finished streams for last stats line.

Otherwise, all streams are finished and the time is nonsensical.

7 years agortpenc_xiph: switch to av_assert
Michael Niedermayer [Tue, 28 Aug 2012 20:29:20 +0000 (22:29 +0200)]
rtpenc_xiph: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosdp: Use static const char arrays instead of pointers to strings
Martin Storsjö [Tue, 28 Aug 2012 16:24:14 +0000 (19:24 +0300)]
sdp: Use static const char arrays instead of pointers to strings

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agogitignore: add scaling_video example.
Clément Bœsch [Tue, 28 Aug 2012 18:35:04 +0000 (20:35 +0200)]
gitignore: add scaling_video example.

7 years agoexamples/Makefile: remove duplicated -f switch
Stefano Sabatini [Tue, 28 Aug 2012 18:06:45 +0000 (20:06 +0200)]
examples/Makefile: remove duplicated -f switch

$(RM) already includes that flag.

Spotted-by: ubitux
7 years agoexamples: add scaling_video example
Stefano Sabatini [Tue, 21 Aug 2012 12:43:51 +0000 (14:43 +0200)]
examples: add scaling_video example

This example should be useful to show the basic functionality of the
libswscale API.

More advanced features (scaling options etc., colorspace tweaking) may be
added later.

7 years agolavfi: add smartblur filter
Jérémy Tran [Tue, 28 Aug 2012 16:41:06 +0000 (18:41 +0200)]
lavfi: add smartblur filter

This is a port of the MPlayer smartblur filter (libmpcodecs/vf_smartblur.c)
by Michael Niedermayer.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoffmpeg: report max time of unfinished streams in stats.
Nicolas George [Mon, 20 Aug 2012 19:06:39 +0000 (21:06 +0200)]
ffmpeg: report max time of unfinished streams in stats.

Eliminating finished streams avoids the progress stopping
with the first stream.
Using the max instead of the min avoids the progress stopping
with gaps in sparse streams (subtitles).
Negligible change for normal circumstances.

7 years agox86: avcodec: Drop silly "_mmx" suffixes from filenames
Diego Biurrun [Wed, 8 Aug 2012 00:12:17 +0000 (02:12 +0200)]
x86: avcodec: Drop silly "_mmx" suffixes from filenames

7 years agox86: avcodec: Drop silly "_sse" suffixes from filenames
Diego Biurrun [Tue, 7 Aug 2012 23:49:46 +0000 (01:49 +0200)]
x86: avcodec: Drop silly "_sse" suffixes from filenames

7 years agosdp: Include profile-level-id for H264
Martin Storsjö [Tue, 28 Aug 2012 11:57:26 +0000 (14:57 +0300)]
sdp: Include profile-level-id for H264

This is required for playback with the Stagefright RTSP framework
on Android.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoadd myself as vda decoder maintainer
Xidorn Quan [Tue, 28 Aug 2012 12:11:47 +0000 (20:11 +0800)]
add myself as vda decoder maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.
Ronald S. Bultje [Tue, 28 Aug 2012 14:41:16 +0000 (07:41 -0700)]
lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutvideoenc: use ff_huff_gen_len_table
Michael Niedermayer [Wed, 22 Aug 2012 02:02:38 +0000 (04:02 +0200)]
utvideoenc: use ff_huff_gen_len_table

Avoid code duplication and provide faster and better compression.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agohuffman: add ff_huff_gen_len_table
Michael Niedermayer [Mon, 27 Aug 2012 14:00:47 +0000 (16:00 +0200)]
huffman: add ff_huff_gen_len_table

The function will be used by utvideo as well.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agocllc: simplify/fix swapped data buffer allocation.
Reimar Döffinger [Mon, 27 Aug 2012 20:11:08 +0000 (20:11 +0000)]
cllc: simplify/fix swapped data buffer allocation.

Using the malloc variant avoids pointless memcpy on size
increase and simplifies handling allocation failure.
Also change code to ensure that allocation, bswap and bitstream
reader all use the same size, even when the packet size is odd
for example.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agortpdec_h264: Don't set the pixel format
Samuel Pitoiset [Sun, 26 Aug 2012 15:35:08 +0000 (17:35 +0200)]
rtpdec_h264: Don't set the pixel format

There is no need for this depacketizer to set the pixel format,
the decoder can do that just fine.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoh264: Check that the codec isn't null before accessing it
Martin Storsjö [Tue, 28 Aug 2012 11:27:10 +0000 (14:27 +0300)]
h264: Check that the codec isn't null before accessing it

This fixes crashes introduced by 2e8f3cbcda5, the codec can be null
when called from parsers.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoaudio_frame_queue: Define af_queue_log_state before using it
Martin Storsjö [Tue, 28 Aug 2012 14:23:16 +0000 (17:23 +0300)]
audio_frame_queue: Define af_queue_log_state before using it

This fixes building with DEBUG defined after the function was made
static and the prototype removed in d7f9786cbc.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 28 Aug 2012 14:28:48 +0000 (16:28 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: export some functions
  configure: use HOSTCC_C/O in check_host_cc
  configure: use AS_O setting in check_as
  configure: use LD_O setting in check_ld()
  Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
  build: Restore dependency of acelp_filters.o on celp_math.o
  celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
  celp_math: Move ff_cos() to the only place it is used
  build: Use portable abstraction for linker/hostcc output file syntax
  configure: Fix shared library creation for OpenBSD
  vp56: Don't use DECLARE_ALIGN on a typedef name
  mss1: move code that will be reused by MSS2 decoder into separate file
  mss1: merge decode_intra() and decode_inter()
  avprobe: Get rid of ugly casts in the options table
  vf_hqdn3d: Remove a duplicate inline declaration

Conflicts:
Makefile
configure
ffprobe.c
libavcodec/Makefile
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/dsputil.c
libavcodec/lsp.c
libavcodec/mss1.c
libavcodec/ra288.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools: add make_chlayout_test perl script.
Nicolas George [Sat, 28 Jul 2012 13:09:56 +0000 (15:09 +0200)]
tools: add make_chlayout_test perl script.

This script uses the flite source to produce files
suitable to test channels order and layout.

7 years agocmdutils: add -layouts option.
Nicolas George [Sun, 29 Jul 2012 22:34:01 +0000 (00:34 +0200)]
cmdutils: add -layouts option.

Extract of the output:

| Individual channels:
| NAME        DESCRIPTION
| FL          front left
| FR          front right
| <snip>
| SDR         surround direct right
|
| Standard channel layouts:
| NAME        DECOMPOSITION
| mono        FC
| stereo      FL+FR
| <snip>
| octagonal   FL+FR+FC+BL+BR+BC+SL+SR
| downmix     DL+DR

7 years agovp56: Don't use DECLARE_ALIGN on a typedef name
Derek Buitenhuis [Mon, 27 Aug 2012 02:09:10 +0000 (22:09 -0400)]
vp56: Don't use DECLARE_ALIGN on a typedef name

Instead, use it on the first member, since by definition, if
any member is aligned, the whole struct must be, in order to
maintain that alignment.

Fixes compilation with some finicky compilers, like a mix of libclang/msvc

Idea for fix from Måns Rullgård.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1: export some functions
Kostya Shishkov [Mon, 27 Aug 2012 17:21:00 +0000 (19:21 +0200)]
vc1: export some functions

This is a preparatory step for the MSS2 decoder which needs to use
the WMV9 decoder to decode some kinds of frames.

From the patch by Alberto Delmás <adelmas@gmail.com>

7 years agovf_hqdn3d: remove duplicate inline
Michael Niedermayer [Tue, 28 Aug 2012 03:19:48 +0000 (05:19 +0200)]
vf_hqdn3d: remove duplicate inline

This should fix compilation with gcc 3

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoallcodecs: fix vda order
Michael Niedermayer [Tue, 28 Aug 2012 02:11:14 +0000 (04:11 +0200)]
allcodecs: fix vda order

Found-by: compn
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: fix vda order
Michael Niedermayer [Tue, 28 Aug 2012 02:10:50 +0000 (04:10 +0200)]
configure: fix vda order

Found-by: compn
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovdadec: implement vda decoder
Xidorn Quan [Sat, 25 Aug 2012 13:25:27 +0000 (21:25 +0800)]
vdadec: implement vda decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaiffdec: support QDM2
Michael Niedermayer [Tue, 28 Aug 2012 01:18:21 +0000 (03:18 +0200)]
aiffdec: support QDM2

Fixes ticket204

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: use HOSTCC_C/O in check_host_cc
Mans Rullgard [Mon, 27 Aug 2012 21:19:42 +0000 (22:19 +0100)]
configure: use HOSTCC_C/O in check_host_cc

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: use AS_O setting in check_as
Mans Rullgard [Mon, 27 Aug 2012 21:19:06 +0000 (22:19 +0100)]
configure: use AS_O setting in check_as

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: use LD_O setting in check_ld()
Mans Rullgard [Mon, 27 Aug 2012 21:04:25 +0000 (22:04 +0100)]
configure: use LD_O setting in check_ld()

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoRevert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
Mans Rullgard [Sat, 25 Aug 2012 11:34:55 +0000 (12:34 +0100)]
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."

This reverts commit 484a337cd7cd8bb180c4a1bd3321881f1c874a92.

These functions were used in f8bed30 "VC1: merge idct8x8, coeff
adjustments and put_pixels" which was reverted in 18b6a69.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agobuild: Restore dependency of acelp_filters.o on celp_math.o
Diego Biurrun [Mon, 27 Aug 2012 19:05:52 +0000 (21:05 +0200)]
build: Restore dependency of acelp_filters.o on celp_math.o

7 years agocelp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
Diego Biurrun [Sun, 26 Aug 2012 09:29:39 +0000 (11:29 +0200)]
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()

7 years agocelp_math: Move ff_cos() to the only place it is used
Diego Biurrun [Sun, 26 Aug 2012 15:27:12 +0000 (17:27 +0200)]
celp_math: Move ff_cos() to the only place it is used

7 years agobuild: Use portable abstraction for linker/hostcc output file syntax
Diego Biurrun [Mon, 27 Aug 2012 03:09:29 +0000 (05:09 +0200)]
build: Use portable abstraction for linker/hostcc output file syntax

7 years agoconfigure: Fix shared library creation for OpenBSD
Brad Smith [Sun, 26 Aug 2012 20:23:06 +0000 (16:23 -0400)]
configure: Fix shared library creation for OpenBSD

OpenBSD does not expect or require symlinked shared libraries with
just the major version in the name.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovp56: Don't use DECLARE_ALIGN on a typedef name
Derek Buitenhuis [Mon, 27 Aug 2012 00:57:08 +0000 (20:57 -0400)]
vp56: Don't use DECLARE_ALIGN on a typedef name

Instead, use it on the first member, since by definition, if
any member is aligned, the whole struct must be, in order to
maintain that alignment.

Fixes compilation with some finicky compilers.

Idea for fix from Måns Rullgård.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agomovenc: support for itunes tempo tag
Kari Lentz [Fri, 24 Aug 2012 19:37:47 +0000 (15:37 -0400)]
movenc: support for itunes tempo tag

Implements support for tmpo atom for mp4 files, typically used to store BPM.  -metadata "tmpo=127" as a command line option will record 127 as the BPM in the meta data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocllc: simplify/fix swapped data buffer allocation.
Reimar Döffinger [Sun, 26 Aug 2012 10:59:38 +0000 (12:59 +0200)]
cllc: simplify/fix swapped data buffer allocation.

Using the malloc variant avoids pointless memcpy on size
increase and simplifies handling allocation failure.
Also change code to ensure that allocation, bswap and bitstream
reader all use the same size, even when the packet size is odd
for example.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agodpx: 10 and 12 bit decoding
Georg Lippitsch [Sun, 26 Aug 2012 12:51:13 +0000 (14:51 +0200)]
dpx: 10 and 12 bit decoding

Rewrite 10 bit dpx decoder to decode into GBRP10 color space
instead of converting to RGB48.
Add 12 bit decoder to decode into GBRP12 color space.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomss1: move code that will be reused by MSS2 decoder into separate file
Kostya Shishkov [Sun, 26 Aug 2012 12:16:07 +0000 (14:16 +0200)]
mss1: move code that will be reused by MSS2 decoder into separate file

7 years agomss1: merge decode_intra() and decode_inter()
Kostya Shishkov [Sun, 26 Aug 2012 11:46:57 +0000 (13:46 +0200)]
mss1: merge decode_intra() and decode_inter()

They have most of their code in common.

7 years agoavprobe: Get rid of ugly casts in the options table
Martin Storsjö [Mon, 27 Aug 2012 11:07:12 +0000 (14:07 +0300)]
avprobe: Get rid of ugly casts in the options table

This also makes sure the function pointers are stored via the same
union member as they are accessed via.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoaiffdec: try #2 to fix bps
Michael Niedermayer [Mon, 27 Aug 2012 14:50:59 +0000 (16:50 +0200)]
aiffdec: try #2 to fix bps

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

* qatar/master:
  vf_hqdn3d: Don't declare the loop variable within the for loop
  huffyuv: update to current coding style
  huffman: update to current coding style
  rtsp: Free the rtpdec context properly
  build: fft: x86: Drop unused YASM-OBJS-FFT- variable

Conflicts:
libavcodec/huffman.c
libavcodec/huffyuv.c
libavcodec/x86/Makefile
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_hqdn3d: Remove a duplicate inline declaration
Martin Storsjö [Mon, 27 Aug 2012 12:55:43 +0000 (15:55 +0300)]
vf_hqdn3d: Remove a duplicate inline declaration

Compilation seems to fail on GCC 3.4 due to this duplicate
declaration.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agovf_hqdn3d: Don't declare the loop variable within the for loop
Martin Storsjö [Mon, 27 Aug 2012 09:33:42 +0000 (12:33 +0300)]
vf_hqdn3d: Don't declare the loop variable within the for loop

This C99 feature is generally not used in the libav codebase,
since it breaks building with some fringe compilers (GCC 2.95,
MSVC).

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agohuffyuv: update to current coding style
Luca Barbato [Mon, 27 Aug 2012 10:30:13 +0000 (12:30 +0200)]
huffyuv: update to current coding style

7 years agohuffman: update to current coding style
Luca Barbato [Mon, 27 Aug 2012 10:29:34 +0000 (12:29 +0200)]
huffman: update to current coding style

7 years agortsp: Free the rtpdec context properly
Martin Storsjö [Fri, 17 Aug 2012 19:22:17 +0000 (22:22 +0300)]
rtsp: Free the rtpdec context properly

The condition for calling the rtpdec cleanup was broken in
df8cf076c86.

This fixes a memory leak.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoexamples/decoding_encoding: make operation logic more self-evident / predictable
Stefano Sabatini [Fri, 24 Aug 2012 15:16:40 +0000 (17:16 +0200)]
examples/decoding_encoding: make operation logic more self-evident / predictable

Add a switch which controls which operation to perform.  Useful to test
only a single feature. Also the new behavior is more self-consistent.

7 years agoexamples/Makefile: apply misc minor fixes to the RM rule
Stefano Sabatini [Mon, 27 Aug 2012 08:00:03 +0000 (10:00 +0200)]
examples/Makefile: apply misc minor fixes to the RM rule

Use $(RM) in place of rm, drop useless "-r" for removing files.

7 years agoexamples/decoding_encoding: store temporary files in current dir
Stefano Sabatini [Thu, 23 Aug 2012 18:17:25 +0000 (20:17 +0200)]
examples/decoding_encoding: store temporary files in current dir

Do not clutter the temporary directory with files, also "/tmp" is not
always available, e.g. in Windows.

Also add the clean-test Makefile rule, which will clean the generated
files.

7 years agoUse correct format identifier for uint64_t.
Carl Eugen Hoyos [Mon, 27 Aug 2012 07:14:40 +0000 (09:14 +0200)]
Use correct format identifier for uint64_t.

7 years agompc: fix seeking to the end
Michael Niedermayer [Mon, 27 Aug 2012 03:01:51 +0000 (05:01 +0200)]
mpc: fix seeking to the end

Fixes Ticket1689

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompc: clip seeking timestamp in valid range
Michael Niedermayer [Mon, 27 Aug 2012 02:51:27 +0000 (04:51 +0200)]
mpc: clip seeking timestamp in valid range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: fft: x86: Drop unused YASM-OBJS-FFT- variable
Diego Biurrun [Sun, 26 Aug 2012 16:13:59 +0000 (18:13 +0200)]
build: fft: x86: Drop unused YASM-OBJS-FFT- variable

7 years agoaiffdec: fix bits per sample
Michael Niedermayer [Mon, 27 Aug 2012 00:02:37 +0000 (02:02 +0200)]
aiffdec: fix bits per sample

Fixes Ticket1660

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix odd YUV width by cropping the video
Marton Balint [Sun, 26 Aug 2012 09:56:47 +0000 (11:56 +0200)]
ffplay: fix odd YUV width by cropping the video

Should fix issue #1322.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: Fix compilation when configuring with a prog suffix
jamal [Sun, 26 Aug 2012 03:19:30 +0000 (00:19 -0300)]
build: Fix compilation when configuring with a prog suffix

Fixes ticket #1676

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_hqdn3d: avoid declaring variable in for()
Michael Niedermayer [Sun, 26 Aug 2012 22:36:31 +0000 (00:36 +0200)]
vf_hqdn3d: avoid declaring variable in for()

This should fix compilation with gcc 2.95 and possibly others

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 26 Aug 2012 20:36:13 +0000 (22:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  audio_frame_queue: Clean up ff_af_queue_log_state debug function
  dwt: Remove unused code.
  cavs: convert cavsdata.h to a .c file
  cavs: Move inline functions only used in one file out of the header
  cavs: Move data tables used in only one place to that file
  fate: Add a single symbol Ut Video decoder test
  vf_hqdn3d: x86 asm
  vf_hqdn3d: support 16bit colordepth
  avconv: prefer user-forced input framerate when choosing output framerate

Conflicts:
ffmpeg.c
libavcodec/audio_frame_queue.c
libavcodec/dwt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: Support writing an index
Michael Niedermayer [Sun, 19 Aug 2012 21:36:26 +0000 (23:36 +0200)]
nutenc: Support writing an index

The seek test improves in accuracy
Fixes Ticket877

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: keep track of max_pts
Michael Niedermayer [Sun, 19 Aug 2012 21:34:38 +0000 (23:34 +0200)]
nutenc: keep track of max_pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: keep track if keyframe PTS
Michael Niedermayer [Sun, 19 Aug 2012 21:33:47 +0000 (23:33 +0200)]
nutenc: keep track if keyframe PTS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutdec: Flip the direction for seeking with an index in the failure case.
Michael Niedermayer [Sun, 19 Aug 2012 21:30:27 +0000 (23:30 +0200)]
nutdec: Flip the direction for seeking with an index in the failure case.

This is closer to how seeking works without an index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutdec: improve information in error message
Michael Niedermayer [Sun, 19 Aug 2012 21:29:58 +0000 (23:29 +0200)]
nutdec: improve information in error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: keep track of the written syncpoint count
Michael Niedermayer [Sun, 19 Aug 2012 20:10:57 +0000 (22:10 +0200)]
nutenc: keep track of the written syncpoint count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaudio_frame_queue: Clean up ff_af_queue_log_state debug function
Diego Biurrun [Sun, 26 Aug 2012 10:44:05 +0000 (12:44 +0200)]
audio_frame_queue: Clean up ff_af_queue_log_state debug function

The function is debug-only, so only compile it in debug mode.
Make it static as it has no uses outside of the file.
Change av_log() to av_dlog().

7 years agodwt: Remove unused code.
Diego Biurrun [Sun, 3 Jul 2011 14:56:01 +0000 (16:56 +0200)]
dwt: Remove unused code.

7 years agocavs: convert cavsdata.h to a .c file
Mans Rullgard [Sun, 26 Aug 2012 07:59:41 +0000 (09:59 +0200)]
cavs: convert cavsdata.h to a .c file

Defining tables in header files is ugly and prone to duplication.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agocavs: Move inline functions only used in one file out of the header
Diego Biurrun [Sun, 26 Aug 2012 07:57:19 +0000 (09:57 +0200)]
cavs: Move inline functions only used in one file out of the header

7 years agocavs: Move data tables used in only one place to that file
Diego Biurrun [Sun, 26 Aug 2012 07:19:33 +0000 (09:19 +0200)]
cavs: Move data tables used in only one place to that file

7 years agofate: Add a single symbol Ut Video decoder test
Jan Ekström [Fri, 24 Aug 2012 11:42:41 +0000 (14:42 +0300)]
fate: Add a single symbol Ut Video decoder test

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovf_hqdn3d: x86 asm
Loren Merritt [Sun, 26 Aug 2012 10:26:42 +0000 (10:26 +0000)]
vf_hqdn3d: x86 asm

13% faster on penryn, 16% on sandybridge, 15% on bulldozer
Not simd; a compiler should have generated this, but gcc didn't.

7 years agovf_hqdn3d: support 16bit colordepth
Loren Merritt [Sun, 26 Aug 2012 10:26:00 +0000 (10:26 +0000)]
vf_hqdn3d: support 16bit colordepth

7 years agoavrndec: silence warning about incompatible pointer types
Paul B Mahol [Sun, 26 Aug 2012 10:23:54 +0000 (10:23 +0000)]
avrndec: silence warning about incompatible pointer types

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