ffmpeg.git
7 years agolavc: fix support of unofficial pix_fmt extensions of jpeg
Michael Niedermayer [Wed, 13 Jun 2012 00:54:57 +0000 (02:54 +0200)]
lavc: fix support of unofficial pix_fmt extensions of jpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c
Stefano Sabatini [Sun, 10 Jun 2012 15:42:47 +0000 (17:42 +0200)]
lavfi: move definition of avfilter_copy_buf_props() from buffer.c to avcodec.c

avcodec.c is where it is defined the lavc/lavfi interface code, so seems
a more adequate location (and doesn't force the inclusion of
libavcodec/avcodec.h where it is not required).

7 years agolavfi: change name of tracing functions and of the macro which enables them
Stefano Sabatini [Tue, 5 Jun 2012 09:24:07 +0000 (11:24 +0200)]
lavfi: change name of tracing functions and of the macro which enables them

The enabling symbol is renamed FF_AVFILTER_TRACE. Avoid conflicts with
the DEBUG macro, which may be defined for different purposes.

7 years agolibvorbis: split encoder from decoder
Paul B Mahol [Tue, 12 Jun 2012 21:37:58 +0000 (21:37 +0000)]
libvorbis: split encoder from decoder

Also fix build dependencies while here.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoarm/intmath: disable av_clip_uintp2_arm with config_small
Michael Niedermayer [Tue, 12 Jun 2012 21:04:16 +0000 (23:04 +0200)]
arm/intmath: disable av_clip_uintp2_arm with config_small

The code otherwise breaks compilation (gcc 4.5 tested but probably any compiler)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocosmetics: align more codecs declarations
Paul B Mahol [Tue, 12 Jun 2012 20:41:18 +0000 (20:41 +0000)]
cosmetics: align more codecs declarations

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibvorbis: cosmetics: remove empty line at EOF
Paul B Mahol [Tue, 12 Jun 2012 03:19:08 +0000 (03:19 +0000)]
libvorbis: cosmetics: remove empty line at EOF

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 12 Jun 2012 18:44:57 +0000 (20:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: Log an error if avfilter fails to configure a link.
  avconv: support only native pthreads.
  rtmp: Fix a possible access to invalid memory location when the playpath is too short.

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: add a "warning" when discarding a oddly backward subtitle or data starttime
Michael Niedermayer [Tue, 12 Jun 2012 17:28:08 +0000 (19:28 +0200)]
lavf: add a "warning" when discarding a oddly backward subtitle or data starttime

Idea-by: ohsix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: handle data like subtitles in start time calculation.
Michael Niedermayer [Tue, 12 Jun 2012 17:07:25 +0000 (19:07 +0200)]
lavf: handle data like subtitles in start time calculation.

This fixes an issue with a crazy data track starting with a large
negative timestamp.

It could as well be solved in all user apps, but this is looking
attractively simpler ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: Log an error if avfilter fails to configure a link.
Alex Converse [Fri, 8 Jun 2012 19:02:04 +0000 (12:02 -0700)]
avfilter: Log an error if avfilter fails to configure a link.

7 years agoswr: mix_2_1_int16_mmx/sse
Michael Niedermayer [Tue, 12 Jun 2012 15:47:19 +0000 (17:47 +0200)]
swr: mix_2_1_int16_mmx/sse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: mix_1_1_int16_sse
Michael Niedermayer [Tue, 12 Jun 2012 14:43:19 +0000 (16:43 +0200)]
swr: mix_1_1_int16_sse

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: mix_1_1 int16 MMX
Michael Niedermayer [Tue, 12 Jun 2012 14:27:00 +0000 (16:27 +0200)]
swr: mix_1_1 int16 MMX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: mix_2_1_float SSE/AVX
Michael Niedermayer [Tue, 12 Jun 2012 14:24:49 +0000 (16:24 +0200)]
swr: mix_2_1_float SSE/AVX

Based-on code by Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: SIMD rematrixing and SSE/AVX mix_1_1 float
Michael Niedermayer [Tue, 12 Jun 2012 14:22:34 +0000 (16:22 +0200)]
swr: SIMD rematrixing and SSE/AVX mix_1_1 float

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add native matrix for SIMD
Michael Niedermayer [Tue, 12 Jun 2012 14:16:15 +0000 (16:16 +0200)]
swr: add native matrix for SIMD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add function pointers for SIMD rematrixing
Michael Niedermayer [Tue, 12 Jun 2012 14:12:08 +0000 (16:12 +0200)]
swr: add function pointers for SIMD rematrixing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswresample.c: update copyleft year
Michael Niedermayer [Tue, 12 Jun 2012 14:11:17 +0000 (16:11 +0200)]
swresample.c: update copyleft year

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: support only native pthreads.
Anton Khirnov [Mon, 11 Jun 2012 13:34:12 +0000 (15:34 +0200)]
avconv: support only native pthreads.

Our w32pthreads wrapper has various issues and is only supposed to be
used in libavcodec.

7 years agortmp: Fix a possible access to invalid memory location when the playpath is too short.
Samuel Pitoiset [Mon, 11 Jun 2012 12:21:32 +0000 (14:21 +0200)]
rtmp: Fix a possible access to invalid memory location when the playpath is too short.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoswr: use &~15
Michael Niedermayer [Tue, 12 Jun 2012 08:28:40 +0000 (10:28 +0200)]
swr: use &~15

Idea-by: reimar (and ubitux on IRC)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: replace /16 by >>4
Michael Niedermayer [Tue, 12 Jun 2012 01:08:02 +0000 (03:08 +0200)]
swr: replace /16 by >>4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/error: add av_make_error_string() and av_err2str() convenience utilities
Stefano Sabatini [Sat, 9 Jun 2012 22:17:45 +0000 (00:17 +0200)]
lavu/error: add av_make_error_string() and av_err2str() convenience utilities

These functions are modeled after the corresponding utilities in
libavutil/timestamp.h.

7 years agolavu/error: fix sign error in av_sterror() error code
Stefano Sabatini [Fri, 1 Jun 2012 21:30:16 +0000 (23:30 +0200)]
lavu/error: fix sign error in av_sterror() error code

The value returned by strerror_r may be positive depending on the system,
so it is necessary to use AVERROR() in order to get a negative
number. This way the successive negative check will not fail, and the
function will print a meaningful error message on the buffer.

7 years agolavu/error: use a table to store error codes and strings, add test
Stefano Sabatini [Mon, 6 Feb 2012 13:16:33 +0000 (14:16 +0100)]
lavu/error: use a table to store error codes and strings, add test

The table is mostly useful to enumerate the available AVERROR* in the
test output.

7 years agotests/parseutils: change test to make it platform independent
Stefano Sabatini [Sun, 10 Jun 2012 13:56:23 +0000 (15:56 +0200)]
tests/parseutils: change test to make it platform independent

Make the test independent from the actual error string used to describe a
certain error code.

7 years agoffmpeg: disable threading on mingw, it doesnt work due to dependance on internal...
Michael Niedermayer [Mon, 11 Jun 2012 21:08:59 +0000 (23:08 +0200)]
ffmpeg: disable threading on mingw, it doesnt work due to dependance on internal code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmpproto: replace strtok_r by av_strtok its unavailable in mingw
Michael Niedermayer [Mon, 11 Jun 2012 21:03:01 +0000 (23:03 +0200)]
rtmpproto: replace strtok_r by av_strtok its unavailable in mingw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 11 Jun 2012 19:55:27 +0000 (21:55 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Do not send extension for flv files
  rtmp: support connection parameters
  doc: Add documentation for the newly added rtmp_* options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopngenc: use av_assert
Michael Niedermayer [Mon, 11 Jun 2012 19:41:03 +0000 (21:41 +0200)]
pngenc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: use av_assert()
Michael Niedermayer [Mon, 11 Jun 2012 19:40:43 +0000 (21:40 +0200)]
4xm: use av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoOptimization of AMR NB and WB decoders for MIPS
Nedeljko Babic [Mon, 4 Jun 2012 16:02:56 +0000 (18:02 +0200)]
Optimization of AMR NB and WB decoders for MIPS

AMR NB and WB decoders are optimized for MIPS architecture.
Appropriate Makefiles are changed accordingly.

Cnfigure script is changed in order to support optimizations.
 Optimizations are enabled by default when compiling is done for
  mips architecture.
 Appropriate cflags are automatically set.
 Support for several mips CPUs is added in configure script.

New ffmpeg options are added for disabling optimizations.

The FFMPEG option --disable-mipsfpu disables MIPS floating point
 optimizations.
The FFMPEG option --disable-mips32r2 disables MIPS32R2
 optimizations.
The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1
 optimizations.
The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2
 optimizations.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRemove eightsvx_raw decoder line
Paul B Mahol [Mon, 11 Jun 2012 18:55:09 +0000 (18:55 +0000)]
Remove eightsvx_raw decoder line

Decoder have been renamed to pcm_s8_planar long ago.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoflvenc: use av_assert instead of assert
Michael Niedermayer [Mon, 11 Jun 2012 18:14:22 +0000 (20:14 +0200)]
flvenc: use av_assert instead of assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv20enc: use av_assert
Michael Niedermayer [Mon, 11 Jun 2012 18:13:31 +0000 (20:13 +0200)]
rv20enc: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmp: Do not send extension for flv files
Samuel Pitoiset [Thu, 7 Jun 2012 15:46:34 +0000 (17:46 +0200)]
rtmp: Do not send extension for flv files

This fixes bugzilla bug #304.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agortmp: support connection parameters
Samuel Pitoiset [Fri, 8 Jun 2012 11:16:34 +0000 (13:16 +0200)]
rtmp: support connection parameters

Allow using connection parameters in order to append arbitrary
AMF data like "B:1 S:authMe O:1 NN:code:1.23 NS:flag:ok O:0" to the
Connect message. You can pass these parameters through the -rtmp_conn
option.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agodoc: Add documentation for the newly added rtmp_* options
Samuel Pitoiset [Fri, 8 Jun 2012 11:15:21 +0000 (13:15 +0200)]
doc: Add documentation for the newly added rtmp_* options

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agorandom_seed: rewrite generic code.
Michael Niedermayer [Mon, 11 Jun 2012 09:47:59 +0000 (11:47 +0200)]
random_seed: rewrite generic code.

The new code is faster and reuses the previous state in case of
multiple calls. For testing the iterations are reduced and several
entropy sources are disabled.
Its based on SHA-1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMake png-in-mov QuickTime-compatible for more colour-spaces.
Carl Eugen Hoyos [Mon, 11 Jun 2012 08:57:23 +0000 (10:57 +0200)]
Make png-in-mov QuickTime-compatible for more colour-spaces.

Reported and tested by ami_stuff.

See ticket #1191.

7 years agomov: export orphan tmcd track metadata to global format metadata.
Clément Bœsch [Mon, 4 Jun 2012 10:06:23 +0000 (12:06 +0200)]
mov: export orphan tmcd track metadata to global format metadata.

7 years agomov: copy timecode metadata from tmcd track to the related video stream.
Clément Bœsch [Mon, 4 Jun 2012 09:10:09 +0000 (11:10 +0200)]
mov: copy timecode metadata from tmcd track to the related video stream.

Apple softwares seem not to add a tref for the timecode (the next commit
fixes this issue), but at least FFmpeg does.

This can be used to generate a sample that demonstrates the feature:

    ./ffmpeg -f lavfi -i testsrc    \
             -f lavfi -i mptestsrc  \
             -f lavfi -i rgbtestsrc \
             -map 0 -map 1 -map 2   \
             -metadata:s:0 timecode=00:00:00:12 \
             -metadata:s:2 timecode=01:02:12:20 \
             -t 10 -y out.mov
    ./ffprobe out.mov

The timecode metadata being transmitted to the video streams, it can be
kept while transmuxed/transcoded.

7 years agomov: parse tref atom.
Clément Bœsch [Mon, 4 Jun 2012 09:09:31 +0000 (11:09 +0200)]
mov: parse tref atom.

7 years agomovenc: add timecode track support.
Clément Bœsch [Mon, 5 Mar 2012 07:51:08 +0000 (08:51 +0100)]
movenc: add timecode track support.

7 years agoriff: add ISMP/timecode tag.
Clément Bœsch [Thu, 31 May 2012 07:31:04 +0000 (09:31 +0200)]
riff: add ISMP/timecode tag.

7 years agoffmpeg: allow overriding framerate for stream copy
Michael Niedermayer [Mon, 11 Jun 2012 01:00:28 +0000 (03:00 +0200)]
ffmpeg: allow overriding framerate for stream copy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvpxenc: add support for forced key frames
James Zern [Sun, 10 Jun 2012 21:15:20 +0000 (14:15 -0700)]
libvpxenc: add support for forced key frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorangecoder: use av_assert
Michael Niedermayer [Sun, 10 Jun 2012 21:36:22 +0000 (23:36 +0200)]
rangecoder: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoamrnbdec: use av_assert
Michael Niedermayer [Sun, 10 Jun 2012 21:35:29 +0000 (23:35 +0200)]
amrnbdec: use av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: remove unreachable assert()
Michael Niedermayer [Sun, 10 Jun 2012 21:27:17 +0000 (23:27 +0200)]
j2k: remove unreachable assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 10 Jun 2012 19:34:15 +0000 (21:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodct-test: fix alignment in ff_prores_idct_put_10_sse2()
Michael Niedermayer [Sun, 10 Jun 2012 18:45:55 +0000 (20:45 +0200)]
dct-test: fix alignment in ff_prores_idct_put_10_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopostprocess: fix another void returning void function.
Michael Niedermayer [Sun, 10 Jun 2012 16:14:51 +0000 (18:14 +0200)]
postprocess: fix another void returning void function.

lets hope this makes suncc happy finally ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: fix signature for default_filter_name()
Stefano Sabatini [Sun, 10 Jun 2012 15:22:52 +0000 (17:22 +0200)]
lavfi: fix signature for default_filter_name()

Return a const char *, fix warnings:
libavfilter/avfilter.c: In function ‘default_filter_name’:
libavfilter/avfilter.c:414:5: warning: return discards ‘const’ qualifier from pointer target type [enabled by default]
libavfilter/avfilter.c: At top level:
libavfilter/avfilter.c:419:5: warning: initialization from incompatible pointer type [enabled by default]
libavfilter/avfilter.c:419:5: warning: (near initialization for ‘avfilter_class.item_name’) [enabled by default]

7 years agompegtsenc: prevent pcr_packet_period==0
Michael Niedermayer [Sun, 10 Jun 2012 14:50:06 +0000 (16:50 +0200)]
mpegtsenc: prevent pcr_packet_period==0

a period of 1 is the smallest that makes sense

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiffenc: use av_assert()
Michael Niedermayer [Sun, 10 Jun 2012 13:38:11 +0000 (15:38 +0200)]
tiffenc: use av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: add missing layout terminator
Michael Niedermayer [Thu, 31 May 2012 22:07:36 +0000 (00:07 +0200)]
libmp3lame: add missing layout terminator

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agovf_fps: set frame_rate.
Nicolas George [Sun, 10 Jun 2012 08:53:03 +0000 (10:53 +0200)]
vf_fps: set frame_rate.

7 years agovf_tile: update deprecated functions.
Nicolas George [Sun, 10 Jun 2012 08:40:33 +0000 (10:40 +0200)]
vf_tile: update deprecated functions.

7 years agovf_tile: set frame_rate.
Nicolas George [Sun, 10 Jun 2012 08:35:17 +0000 (10:35 +0200)]
vf_tile: set frame_rate.

7 years agosdl: fix aspect ratio computations.
Nicolas George [Sat, 9 Jun 2012 19:03:18 +0000 (21:03 +0200)]
sdl: fix aspect ratio computations.

The rounding was wrong due to incorrect ue of floats,
changed to rationals and av_rescale.

The results were not properly passed to SDL.

7 years agosdl: fix overlay size.
Nicolas George [Sat, 9 Jun 2012 10:28:44 +0000 (12:28 +0200)]
sdl: fix overlay size.

The size passed to SDL_CreateYUVOverlay is the size
of the video in pixels, it must not take the aspect ratio
into account.

7 years agosdl: add AVFMT_VARIABLE_FPS and AVFMT_NOTIMESTAMPS.
Nicolas George [Sat, 9 Jun 2012 09:28:44 +0000 (11:28 +0200)]
sdl: add AVFMT_VARIABLE_FPS and AVFMT_NOTIMESTAMPS.

It allows vsync to be automatically set to passthrough.

7 years agoavconv: multithreaded demuxing.
Anton Khirnov [Sat, 2 Jun 2012 05:26:41 +0000 (07:26 +0200)]
avconv: multithreaded demuxing.

When there are multiple input files, run demuxing for each input file in
a separate thread, so reading packets does not block.

This is useful for achieving low latency when reading from multiple
(possibly slow) input streams.

7 years agoBump lavu minor and add an APIChanges entry for audioconvert functions.
Anton Khirnov [Mon, 28 May 2012 19:40:44 +0000 (21:40 +0200)]
Bump lavu minor and add an APIChanges entry for audioconvert functions.

7 years agoaudioconvert: add a function for extracting the channel with the given index
Anton Khirnov [Mon, 28 May 2012 10:20:57 +0000 (12:20 +0200)]
audioconvert: add a function for extracting the channel with the given index

7 years agoaudioconvert: add a function for getting the name of a single channel.
Anton Khirnov [Mon, 28 May 2012 06:39:10 +0000 (08:39 +0200)]
audioconvert: add a function for getting the name of a single channel.

7 years agoaudioconvert: add a function for getting channel's index in layout
Anton Khirnov [Mon, 28 May 2012 06:16:40 +0000 (08:16 +0200)]
audioconvert: add a function for getting channel's index in layout

7 years agoaudioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
Anton Khirnov [Sat, 9 Jun 2012 18:14:12 +0000 (20:14 +0200)]
audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels

7 years agovf_libopencv: add missing headers.
Anton Khirnov [Sat, 9 Jun 2012 14:00:16 +0000 (16:00 +0200)]
vf_libopencv: add missing headers.

Fix build after b74a1da4.

7 years agoiac: add missing dependency
Kostya Shishkov [Sat, 9 Jun 2012 17:19:07 +0000 (19:19 +0200)]
iac: add missing dependency

7 years agobprint-test: avoid z modifier, mingw fails with it
Michael Niedermayer [Sun, 10 Jun 2012 01:49:31 +0000 (03:49 +0200)]
bprint-test: avoid z modifier, mingw fails with it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosink_buffer: dont return void from void functions.
Michael Niedermayer [Sun, 10 Jun 2012 01:30:12 +0000 (03:30 +0200)]
sink_buffer: dont return void from void functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/x86/rv40dsp_init.c: add missing HAVE_YASM
Michael Niedermayer [Sun, 10 Jun 2012 01:26:24 +0000 (03:26 +0200)]
libavcodec/x86/rv40dsp_init.c: add missing HAVE_YASM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM
Michael Niedermayer [Sun, 10 Jun 2012 01:23:44 +0000 (03:23 +0200)]
libavcodec/x86/h264dsp_mmx.c: add forgotten HAVE_YASM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/x86/dwt.c: move some missed things under HAVE_YASM
Michael Niedermayer [Sun, 10 Jun 2012 01:20:27 +0000 (03:20 +0200)]
libavcodec/x86/dwt.c: move some missed things under HAVE_YASM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodct-test: fix #if for ff_prores_idct_put_10_sse2()
Michael Niedermayer [Sun, 10 Jun 2012 01:15:38 +0000 (03:15 +0200)]
dct-test: fix #if for ff_prores_idct_put_10_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter: make ff_null_start_frame_keep_ref() a non static inline function.
Michael Niedermayer [Sun, 10 Jun 2012 01:08:19 +0000 (03:08 +0200)]
libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.

Its only used through the start_frame pointer and thus cannot be inlined easily.
It also appears to break compilation with some unidentified compiler on darwin.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate-acodec-dca2: add bitexact flag
Michael Niedermayer [Sun, 10 Jun 2012 00:57:45 +0000 (02:57 +0200)]
fate-acodec-dca2: add bitexact flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoenc_dec_pcm: add bitexact flag
Michael Niedermayer [Sun, 10 Jun 2012 00:57:25 +0000 (02:57 +0200)]
enc_dec_pcm: add bitexact flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: dont return void from a void function
Michael Niedermayer [Sun, 10 Jun 2012 00:38:01 +0000 (02:38 +0200)]
cmdutils: dont return void from a void function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: use externally provided dimensions when they appear to be more correct.
Michael Niedermayer [Sun, 10 Jun 2012 00:12:20 +0000 (02:12 +0200)]
h264: use externally provided dimensions when they appear to be more correct.

This is based on:
commit 30f515091c323da59c0f1b533703dedca2f4b95d
Author: Mans Rullgard <mans@mansr.com>
     h264: allow cropping to AVCodecContext.width/height

The above commit is not taken as is as its buggy (incorrect handling of
the interlaced case) and didnt apply cleanly.

Fixes ticket156

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopenjpegdec: make use of FF_ARRAY_ELEMS
Paul B Mahol [Sat, 9 Jun 2012 23:29:41 +0000 (23:29 +0000)]
libopenjpegdec: make use of FF_ARRAY_ELEMS

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping
James Zern [Sat, 9 Jun 2012 21:40:51 +0000 (14:40 -0700)]
libvpxenc: add VP8E_SET_MAX_INTRA_BITRATE_PCT mapping

defines 'max-intra-rate' in line with vpxenc param

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE
Stefano Sabatini [Sat, 9 Jun 2012 22:00:33 +0000 (00:00 +0200)]
lavu/timestamp: remove duplicate definition of AV_TS_MAX_STRING_SIZE

7 years agolibopenjpeg: YUVA422P and YUVA444P support
Paul B Mahol [Sat, 9 Jun 2012 18:33:29 +0000 (18:33 +0000)]
libopenjpeg: YUVA422P and YUVA444P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 9 Jun 2012 18:30:17 +0000 (20:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
libavcodec/h264.c
libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: add yuva422p to .pix_fmts
Paul B Mahol [Sat, 9 Jun 2012 18:15:50 +0000 (18:15 +0000)]
ffv1enc: add yuva422p to .pix_fmts

This was forgotten in 4e4634aa160ad0e27bee5e7809edbfcace08eba6.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 9 Jun 2012 18:09:51 +0000 (20:09 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoremove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not...
J. Bohl [Sat, 9 Jun 2012 15:45:41 +0000 (17:45 +0200)]
remove unreferenced table "dnxhd_1238_ac_index_flag" (empty curly braces did not compile with ICL12.1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopenjpegdec: unbreak yuva420p support
Paul B Mahol [Sat, 9 Jun 2012 18:06:09 +0000 (18:06 +0000)]
libopenjpegdec: unbreak yuva420p support

Regression introduced in b7a928b2d1563575a8d9ec5aa606f735620b38ab.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffplay: fix return value of get_video_frame if avcodec_decode_video fails
Marton Balint [Sat, 9 Jun 2012 17:44:58 +0000 (19:44 +0200)]
ffplay: fix return value of get_video_frame if avcodec_decode_video fails

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agocolorspace-test: add few more tests
Paul B Mahol [Sat, 9 Jun 2012 12:12:41 +0000 (12:12 +0000)]
colorspace-test: add few more tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofloat_dsp.c: Restore author attribution that was removed by libav while moving code...
Michael Niedermayer [Fri, 8 Jun 2012 21:48:35 +0000 (23:48 +0200)]
float_dsp.c: Restore author attribution that was removed by libav while moving code to libavutil

Original code comes from:
commit eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 0bde73d907dbe684e01bafc979bf4a04ddeace1d
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue May 17 19:02:43 2005 +0000

    Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/float_dsp.asm: restore author attribution
Michael Niedermayer [Fri, 8 Jun 2012 21:35:35 +0000 (23:35 +0200)]
x86/float_dsp.asm: restore author attribution

The attribution was removed by libav while moving the code to libavutil

The original code is from
commit eb4825b5d43bb6ecfae4d64688f9e2d2ac075263
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Thu Aug 10 19:06:25 2006 +0000

    sse and 3dnow implementations of float->int conversion and mdct windowing.
    15% faster vorbis.

and

commit 069720565ce0f2cc94fa2474f30d155b2755e350
Author: Loren Merritt <lorenm@u.washington.edu>
Date:   Fri Aug 11 18:19:37 2006 +0000

    vorbis simd tweaks

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: allow cropping to AVCodecContext.width/height
Mans Rullgard [Wed, 30 May 2012 03:04:54 +0000 (04:04 +0100)]
h264: allow cropping to AVCodecContext.width/height

Override the frame size from the SPS with AVCodecContext values
if the latter specify a size smaller by less than one macroblock.
This is required for correct cropping of MOV files from Canon cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agomov: set AVCodecContext.width/height for h264
Mans Rullgard [Wed, 30 May 2012 03:06:00 +0000 (04:06 +0100)]
mov: set AVCodecContext.width/height for h264

This is required for correct cropping of files from Canon
cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavc/bintext: check extradata size
Michael Niedermayer [Sat, 9 Jun 2012 13:03:04 +0000 (15:03 +0200)]
lavc/bintext: check extradata size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
Michael Niedermayer [Sat, 9 Jun 2012 12:36:41 +0000 (14:36 +0200)]
lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>