ffmpeg.git
6 years agoamerge/astreamsync/pan: fix license boilerplate.
Nicolas George [Thu, 2 Aug 2012 17:28:55 +0000 (19:28 +0200)]
amerge/astreamsync/pan: fix license boilerplate.

The boilerplate states that the files are under LGPL,
but refer the user to the GPL at one place.
These files were (re)implemented specifically for FFmpeg.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 2 Aug 2012 20:25:07 +0000 (22:25 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fft: fix imdct_half() for AVX
  rtmppkt: Add missing libavcodec/bytestream.h include.
  rtmp: add functions for reading AMF values
  vc1dec: remove useless #include simple_idct.h
  dct-test: always link with aandcttab.o
  vp8: pack struct VP8ThreadData more efficiently
  x86: remove libmpeg2 mmx(ext) idct functions
  eamad: Use dsputils instead of a custom bswap16_buf
  Canopus Lossless decoder

Conflicts:
Changelog
LICENSE
libavcodec/avcodec.h
libavcodec/cllc.c
libavcodec/eamad.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
Ronald S. Bultje [Wed, 1 Aug 2012 03:23:39 +0000 (20:23 -0700)]
fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.

64-bit CPUs always have SSE available, thus there is no need to compile
in the 3dnow functions. This results in smaller binaries.

6 years agoeamad: Use dsputils instead of its own bswap16_buf
Derek Buitenhuis [Wed, 1 Aug 2012 20:38:10 +0000 (16:38 -0400)]
eamad: Use dsputils instead of its own bswap16_buf

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacenc: switch to av_assert
Michael Niedermayer [Thu, 2 Aug 2012 19:58:17 +0000 (21:58 +0200)]
flacenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacdec: switch to av_assert
Michael Niedermayer [Thu, 2 Aug 2012 19:58:03 +0000 (21:58 +0200)]
flacdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: fft: fix imdct_half() for AVX
Ronald S. Bultje [Thu, 2 Aug 2012 17:15:46 +0000 (12:15 -0500)]
x86: fft: fix imdct_half() for AVX

Some calculations were changed in b6a3849 to use mmsize, which was not correct
for the AVX version, which uses INIT_YMM and therefore has mmsize == 32.

Fixes Bug 341.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agortmppkt: Add missing libavcodec/bytestream.h include.
Alex Rønne Petersen [Thu, 2 Aug 2012 16:24:01 +0000 (16:24 +0000)]
rtmppkt: Add missing libavcodec/bytestream.h include.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agompegtsenc: Fix AC3 Sound issue with Blu-ray Players.
Kifayat ullah [Thu, 2 Aug 2012 14:01:56 +0000 (15:01 +0100)]
mpegtsenc: Fix AC3 Sound issue with Blu-ray Players.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoassdec: return EOF instead of EIO.
Nicolas George [Thu, 2 Aug 2012 09:21:20 +0000 (11:21 +0200)]
assdec: return EOF instead of EIO.

6 years agortmp: add functions for reading AMF values
Jordi Ortiz [Wed, 1 Aug 2012 09:25:19 +0000 (11:25 +0200)]
rtmp: add functions for reading AMF values

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovc1dec: remove useless #include simple_idct.h
Mans Rullgard [Wed, 1 Aug 2012 16:15:42 +0000 (17:15 +0100)]
vc1dec: remove useless #include simple_idct.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodct-test: always link with aandcttab.o
Mans Rullgard [Wed, 1 Aug 2012 13:32:19 +0000 (14:32 +0100)]
dct-test: always link with aandcttab.o

This allows building dct-test even if aandcttab.o is not pulled in
by any enabled codec.  The DCT with which these tables are used does
not use them directly, so building it without the tables is possible.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agovp8: pack struct VP8ThreadData more efficiently
Mans Rullgard [Wed, 1 Aug 2012 13:01:08 +0000 (14:01 +0100)]
vp8: pack struct VP8ThreadData more efficiently

Reordering the members in this struct reduces the holes required
to maintain alignment.  With this order, the only remaining, and
unavoidable, hole is 3 bytes following left_nnz.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agox86: remove libmpeg2 mmx(ext) idct functions
Mans Rullgard [Wed, 1 Aug 2012 12:16:23 +0000 (13:16 +0100)]
x86: remove libmpeg2 mmx(ext) idct functions

These functions are not faster than other mmx implementations on
any hardware I have been able to test on, and they are horribly
inaccurate.  There is thus no reason to ever use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavfi/rgbtestsrc: use ff_fill_rgba_map() rather than a local copy
Stefano Sabatini [Thu, 2 Aug 2012 09:13:38 +0000 (11:13 +0200)]
lavfi/rgbtestsrc: use ff_fill_rgba_map() rather than a local copy

Also convert int rgba_map[4] to uint8_t rgba_map[4], as required by
ff_fill_rgba_map().

Simplify.

6 years agolavfi/drawutils: make ff_draw_color() accept a const rgba map
Stefano Sabatini [Wed, 1 Aug 2012 21:52:25 +0000 (23:52 +0200)]
lavfi/drawutils: make ff_draw_color() accept a const rgba map

6 years agolavfi/video: remove duplicated function ff_null_start_frame_keep_ref()
Stefano Sabatini [Thu, 2 Aug 2012 09:59:57 +0000 (11:59 +0200)]
lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

Semantic for the function ff_null_start_frame() was changed in
07bad27810cd, and it has now the same behavior of
ff_null_start_frame_keep_ref(), thus it makes no sense to keep both of
them.

6 years agovorbisdec: fix heap buffer overflow.
Michael Niedermayer [Thu, 2 Aug 2012 10:21:25 +0000 (12:21 +0200)]
vorbisdec: fix heap buffer overflow.

Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegaudio_tablegen: try to fix hardcoded tables
Michael Niedermayer [Thu, 2 Aug 2012 04:10:28 +0000 (06:10 +0200)]
mpegaudio_tablegen: try to fix hardcoded tables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'dwbuiten/master'
Michael Niedermayer [Thu, 2 Aug 2012 02:48:35 +0000 (04:48 +0200)]
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  Canopus Lossless decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: adjust IMDCT scaling to avoid overflows
Michael Niedermayer [Thu, 2 Aug 2012 02:21:53 +0000 (04:21 +0200)]
mp3dec: adjust IMDCT scaling to avoid overflows

Fixes ticket268

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoeamad: Use dsputils instead of a custom bswap16_buf
Derek Buitenhuis [Wed, 1 Aug 2012 19:22:50 +0000 (19:22 +0000)]
eamad: Use dsputils instead of a custom bswap16_buf

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoCanopus Lossless decoder
Derek Buitenhuis [Wed, 1 Aug 2012 17:46:53 +0000 (17:46 +0000)]
Canopus Lossless decoder

At the moment it only does BGR24, but I plan to add the rest after.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoCanopus Lossless decoder
Derek Buitenhuis [Fri, 27 Jul 2012 23:08:23 +0000 (19:08 -0400)]
Canopus Lossless decoder

At the moment it only does BGR24, but I plan to add the rest after.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoconfigure: reduce difference to qatar by 2 lines
Michael Niedermayer [Wed, 1 Aug 2012 22:41:16 +0000 (00:41 +0200)]
configure: reduce difference to qatar by 2 lines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 1 Aug 2012 21:33:06 +0000 (23:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
  ARM: use =const syntax instead of explicit literal pools
  ARM: use standard syntax for all LDRD/STRD instructions
  fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
  dct-test: allow to compile without HAVE_INLINE_ASM.
  x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
  dca: Move tables used outside of dcadec.c to a separate file.
  dca: Rename dca.c ---> dcadec.c
  x86: h264dsp: Remove unused variable ff_pb_3_1
  apetag: change a forgotten return to return 0

Conflicts:
libavcodec/Makefile
libavcodec/dca.c
libavcodec/x86/fft_3dn.c
libavcodec/x86/fft_3dn2.c
libavcodec/x86/fft_mmx.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/testsrc: use AVFILTER_DEFINE_CLASS for defining the filter classes
Stefano Sabatini [Wed, 1 Aug 2012 08:37:53 +0000 (10:37 +0200)]
lavfi/testsrc: use AVFILTER_DEFINE_CLASS for defining the filter classes

Factorize.

6 years agolavfi/testsrc: extend logic in request_frame, support static image output
Stefano Sabatini [Tue, 31 Jul 2012 19:14:49 +0000 (21:14 +0200)]
lavfi/testsrc: extend logic in request_frame, support static image output

6 years agolavfi/testsrc: free the context in uninit
Stefano Sabatini [Tue, 31 Jul 2012 14:34:36 +0000 (16:34 +0200)]
lavfi/testsrc: free the context in uninit

Keeping stuff in the context can be useful for debugging purposes.

6 years agoalac: remove redundant "alac: " from log messages
Paul B Mahol [Wed, 1 Aug 2012 18:26:10 +0000 (18:26 +0000)]
alac: remove redundant "alac: " from log messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswr: fix 10l typo mixing in and out config.
Michael Niedermayer [Wed, 1 Aug 2012 19:13:50 +0000 (21:13 +0200)]
swr: fix 10l typo mixing in and out config.

Fixes ticket1458

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: honor -ss and -t parameters with muxed subtitles.
Clément Bœsch [Wed, 1 Aug 2012 16:39:46 +0000 (18:39 +0200)]
ffmpeg: honor -ss and -t parameters with muxed subtitles.

This patch fixes two things:

 - in case of subtitles, check_recording_time() is comparing the current
   PTS to the recording time (-t option, set to INT_MAX by default), so
   the -ss option needs to be taken into account. It is not required in
   do_{audio,video}_out() because this adjustment is set while polling
   the filtergraph (see poll_filters()).

 - It also adjusts the PTS sent to the encoder (and later transmitted to
   the muxer) so the TS in the output make sense and are not kept
   verbatim.

Note: this only works for muxers honoring the PTS, such as
lavf/matroskaenc. But for other such as the ASS muxer which just does a
verbatim copy, or the SubRip muxer which doesn't write the TS in some
cases, it will not work yet.

6 years agotiny_psnr: fix undefined shift
Michael Niedermayer [Wed, 1 Aug 2012 17:48:43 +0000 (19:48 +0200)]
tiny_psnr: fix undefined shift

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonuv: Fix playback of RTjpeg from current MythTV,
Reimar Döffinger [Tue, 31 Jul 2012 18:47:24 +0000 (20:47 +0200)]
nuv: Fix playback of RTjpeg from current MythTV,

The previous validity check seems to work only for some
(presumably older) files, in current versions the first bytes
now contain the data size.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agonuv: check size of buffer before accessing it instead of after.
Reimar Döffinger [Tue, 31 Jul 2012 18:32:38 +0000 (20:32 +0200)]
nuv: check size of buffer before accessing it instead of after.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agotimecode: show frame rate when invalid.
Clément Bœsch [Tue, 31 Jul 2012 12:32:12 +0000 (14:32 +0200)]
timecode: show frame rate when invalid.

6 years agoconfigure: add support for dlltool when lib.exe is unavailable
Michael Niedermayer [Wed, 1 Aug 2012 15:01:37 +0000 (17:01 +0200)]
configure: add support for dlltool when lib.exe is unavailable

The lib.exe test is untested. Someone who has lib.exe please test and fix it if it doesnt work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add test for the tile video filter.
Nicolas George [Wed, 1 Aug 2012 12:00:29 +0000 (14:00 +0200)]
fate: add test for the tile video filter.

6 years agoapetag: return value when required.
Nicolas George [Wed, 1 Aug 2012 08:08:25 +0000 (10:08 +0200)]
apetag: return value when required.

Should fix compilation on clang.

6 years agovf_tile: fix output buffer ownership.
Nicolas George [Wed, 1 Aug 2012 10:23:48 +0000 (12:23 +0200)]
vf_tile: fix output buffer ownership.

There is no need to start_frame immediately on the output link
since the rest is only done with the last frame of the tile.
link->out_buf is now automatically dereferenced; since we give
it away it must be cleared.

Fix an assert failure; found by Clément Bœsch.

6 years agodca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
Diego Biurrun [Wed, 1 Aug 2012 09:12:08 +0000 (11:12 +0200)]
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs

6 years agoARM: use =const syntax instead of explicit literal pools
Mans Rullgard [Tue, 31 Jul 2012 23:59:35 +0000 (00:59 +0100)]
ARM: use =const syntax instead of explicit literal pools

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: use standard syntax for all LDRD/STRD instructions
Mans Rullgard [Tue, 31 Jul 2012 22:58:58 +0000 (23:58 +0100)]
ARM: use standard syntax for all LDRD/STRD instructions

The standard syntax requires two destination registers for
LDRD/STRD instructions.  Some versions of the GNU assembler
allow using only one with the second implicit, others are
more strict.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavfi/testsrc: drop pointless parentheses
Stefano Sabatini [Wed, 1 Aug 2012 08:30:41 +0000 (10:30 +0200)]
lavfi/testsrc: drop pointless parentheses

6 years agolavfi: remove unused defaults.c file
Stefano Sabatini [Tue, 31 Jul 2012 13:53:40 +0000 (15:53 +0200)]
lavfi: remove unused defaults.c file

6 years ago8svx: ensure that packet size is multiple of channels.
Nicolas George [Tue, 31 Jul 2012 21:45:16 +0000 (23:45 +0200)]
8svx: ensure that packet size is multiple of channels.

Fix an assert failure with packets of invalid size.

6 years agoSkip chan tag padding.
Carl Eugen Hoyos [Wed, 1 Aug 2012 06:33:18 +0000 (08:33 +0200)]
Skip chan tag padding.

Fixes ticket #1580

6 years agofft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
Ronald S. Bultje [Wed, 1 Aug 2012 03:23:39 +0000 (20:23 -0700)]
fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.

64-bit CPUs always have SSE available, thus there is no need to compile
in the 3dnow functions. This results in smaller binaries.

6 years agodct-test: allow to compile without HAVE_INLINE_ASM.
Ronald S. Bultje [Wed, 1 Aug 2012 03:30:29 +0000 (20:30 -0700)]
dct-test: allow to compile without HAVE_INLINE_ASM.

6 years agox86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
Ronald S. Bultje [Thu, 26 Jul 2012 03:30:19 +0000 (20:30 -0700)]
x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.

6 years agopaf: use reget_bufer() instead of get_buffer()
Paul B Mahol [Mon, 30 Jul 2012 13:00:44 +0000 (13:00 +0000)]
paf: use reget_bufer() instead of get_buffer()

Pallete is written to frame->data[1] only if it changes.
This fixes PAL8->PAL8 transcoding.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoxvma: remove unused variable
Paul B Mahol [Tue, 31 Jul 2012 23:29:37 +0000 (23:29 +0000)]
xvma: remove unused variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264_mc_template: switch to av_assert
Michael Niedermayer [Wed, 1 Aug 2012 02:19:46 +0000 (04:19 +0200)]
h264_mc_template: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog722enc: switch to av_assert
Michael Niedermayer [Wed, 1 Aug 2012 02:19:27 +0000 (04:19 +0200)]
g722enc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: avoid bogus error with "test.flac -c copy -f null -"
Michael Niedermayer [Tue, 31 Jul 2012 23:47:51 +0000 (01:47 +0200)]
ffmpeg: avoid bogus error with "test.flac -c copy -f null -"

Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodca: Move tables used outside of dcadec.c to a separate file.
Diego Biurrun [Tue, 31 Jul 2012 18:09:23 +0000 (20:09 +0200)]
dca: Move tables used outside of dcadec.c to a separate file.

6 years agodca: Rename dca.c ---> dcadec.c
Diego Biurrun [Tue, 31 Jul 2012 18:00:35 +0000 (20:00 +0200)]
dca: Rename dca.c ---> dcadec.c

This will allow adding dca.c with tables used from other files.

6 years agox86: h264dsp: Remove unused variable ff_pb_3_1
Diego Biurrun [Tue, 31 Jul 2012 15:12:51 +0000 (17:12 +0200)]
x86: h264dsp: Remove unused variable ff_pb_3_1

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 31 Jul 2012 20:41:00 +0000 (22:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpc8: return more meaningful error codes.
  mpc: return more meaningful error codes.
  wv,mpc8: don't return apetag data in packets.
  rtmp: do not warn about receiving metadata packets
  x86: h264dsp: Adjust YASM #ifdefs
  x86: yadif: Mark mmxext optimizations as such
  h264: convert loop filter strength dsp function to yasm.
  Improve descriptiveness of a number of codec and container long names

Conflicts:
libavcodec/flvdec.c
libavcodec/libopenjpegdec.c
libavformat/apetag.c
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapetag: change a forgotten return to return 0
Anton Khirnov [Tue, 31 Jul 2012 19:32:25 +0000 (21:32 +0200)]
apetag: change a forgotten return to return 0

6 years agompc8: return more meaningful error codes.
Anton Khirnov [Mon, 30 Jul 2012 05:29:34 +0000 (07:29 +0200)]
mpc8: return more meaningful error codes.

6 years agompc: return more meaningful error codes.
Anton Khirnov [Sun, 29 Jul 2012 20:19:35 +0000 (22:19 +0200)]
mpc: return more meaningful error codes.

6 years agowv,mpc8: don't return apetag data in packets.
Anton Khirnov [Mon, 30 Jul 2012 05:28:35 +0000 (07:28 +0200)]
wv,mpc8: don't return apetag data in packets.

6 years agoloco: fix return value.
Nicolas George [Sat, 28 Jul 2012 22:14:27 +0000 (00:14 +0200)]
loco: fix return value.

The return value was the number of bytes left,
it is supposed to be the number of bytes used.

6 years agoloco: take decode overflow into account.
Nicolas George [Sat, 28 Jul 2012 22:12:27 +0000 (00:12 +0200)]
loco: take decode overflow into account.

Commit 2bf0982 introduced an overflow check in loco_decode_plane,
but the error code is never taken into account, leading to
completely idiotic return values.

6 years agosp5xdec: sanitize return value.
Nicolas George [Sat, 28 Jul 2012 21:52:50 +0000 (23:52 +0200)]
sp5xdec: sanitize return value.

i is the decoded size of a recoded packet, which is larger
than the original packet. Assume that if decoding succeeded,
all the packet was used.

6 years ago8svx: unify mono and stereo code paths.
Nicolas George [Sun, 29 Jul 2012 10:46:48 +0000 (12:46 +0200)]
8svx: unify mono and stereo code paths.

6 years ago8svx: remove useless rounding code.
Nicolas George [Sun, 29 Jul 2012 10:45:31 +0000 (12:45 +0200)]
8svx: remove useless rounding code.

samples_size and samples_idx are supposed to be multiple of
channels at all time. If they are, the division is exact;
if they are not, something is very wrong in the code.

6 years ago8svx: use a more direct condition.
Nicolas George [Sun, 29 Jul 2012 10:33:35 +0000 (12:33 +0200)]
8svx: use a more direct condition.

esc->table was inited based on codec->id: re-testing codec->id
is code duplication and can lead to inconsistencies.

6 years agomovtextdec: fix return value for too small packets.
Nicolas George [Sun, 29 Jul 2012 12:56:59 +0000 (14:56 +0200)]
movtextdec: fix return value for too small packets.

6 years agommvideo: count preamble size in return value.
Nicolas George [Sat, 28 Jul 2012 17:36:21 +0000 (19:36 +0200)]
mmvideo: count preamble size in return value.

MM_PREAMBLE_SIZE is subtracted from buf_size almost immediately.
The original size is still in avpkt->size.

6 years agovc1dec: count ENDOFSEQ code in return value.
Nicolas George [Sat, 28 Jul 2012 17:24:39 +0000 (19:24 +0200)]
vc1dec: count ENDOFSEQ code in return value.

6 years agoffprobe: fix validity error with tags and data.
Nicolas George [Tue, 31 Jul 2012 09:53:30 +0000 (11:53 +0200)]
ffprobe: fix validity error with tags and data.

Add "data" and "extradata" attributes to the schema.
Add "tag" element in "streams".
Print extradata before tags to avoid closing the element.

Fix trac ticket #1588.

6 years agortmp: do not warn about receiving metadata packets
Samuel Pitoiset [Thu, 26 Jul 2012 19:10:09 +0000 (21:10 +0200)]
rtmp: do not warn about receiving metadata packets

They are managed in get_packet()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agox86: h264dsp: Adjust YASM #ifdefs
Diego Biurrun [Tue, 31 Jul 2012 10:32:29 +0000 (12:32 +0200)]
x86: h264dsp: Adjust YASM #ifdefs

This fixes compilation with YASM disabled.

6 years agox86: yadif: Mark mmxext optimizations as such
Diego Biurrun [Tue, 31 Jul 2012 10:17:02 +0000 (12:17 +0200)]
x86: yadif: Mark mmxext optimizations as such

The yadif mmx optimizations contain the pmaxsw and pmaxub mmxext
instructions, causing sigills on CPUs that do not support mmxext.

6 years agolavfi/movie: force channel layout if not set by the decoder
Stefano Sabatini [Mon, 30 Jul 2012 17:46:36 +0000 (19:46 +0200)]
lavfi/movie: force channel layout if not set by the decoder

This ensures that the output buffers will have the channel layout set,
which is required by filters.

Also consistent with ffmpeg.c behavior.

6 years agoffprobe: show audio frame channels and channel_layout
Stefano Sabatini [Mon, 30 Jul 2012 13:53:14 +0000 (15:53 +0200)]
ffprobe: show audio frame channels and channel_layout

6 years agolavc: add channels field to AVFrame
Stefano Sabatini [Mon, 30 Jul 2012 13:24:30 +0000 (15:24 +0200)]
lavc: add channels field to AVFrame

This is required otherwise it is not always possible to guess the number
of channels from the layout, for example if the channel layout is
unknown.

6 years agolavfi/asettb: do not create a new reference in filter_samples()
Stefano Sabatini [Mon, 30 Jul 2012 12:58:22 +0000 (14:58 +0200)]
lavfi/asettb: do not create a new reference in filter_samples()

There is no need to duplicate the input reference, since a filter should
not pass along a reference which is later modified. If this happens the
filter passing the reference should be fixed.

Also improve consistency with start_frame() of settb, allowing a pending
factorization.

6 years agolavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values
Stefano Sabatini [Mon, 30 Jul 2012 17:45:17 +0000 (19:45 +0200)]
lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values

The documentation was erroneously removed in 7cf9aadd.

6 years agoh264: convert loop filter strength dsp function to yasm.
Ronald S. Bultje [Sat, 28 Jul 2012 17:11:00 +0000 (10:11 -0700)]
h264: convert loop filter strength dsp function to yasm.

This completes the conversion of h264dsp to yasm; note that h264 also
uses some dsputil functions, most notably qpel. Performance-wise, the
yasm-version is ~10 cycles faster (182->172) on x86-64, and ~8 cycles
faster (201->193) on x86-32.

6 years agompegdemux: Fix probing of unrecognized_mpeg_video.mpg
Michael Niedermayer [Tue, 31 Jul 2012 01:59:29 +0000 (03:59 +0200)]
mpegdemux: Fix probing of unrecognized_mpeg_video.mpg

Fixes Ticket1586

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: fix handling of max_coded dimensions
Michael Niedermayer [Tue, 31 Jul 2012 01:00:35 +0000 (03:00 +0200)]
vc1dec: fix handling of max_coded dimensions

Fixes Ticket1502

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videoenc: ensure SAR is within the supported range
Michael Niedermayer [Mon, 30 Jul 2012 23:57:18 +0000 (01:57 +0200)]
mpeg4videoenc: ensure SAR is within the supported range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 30 Jul 2012 21:04:28 +0000 (23:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avformat: Drop pointless "format" from container long names
  swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
  wv: K&R formatting cosmetics
  configure: Add missing descriptions to help output
  h264_ps: declare array of colorspace strings on its own line.
  fate: amix: specify f32 sample format for comparison
  tiny_psnr: support 32-bit float samples
  eamad/eatgq/eatqi: call special EA IDCT directly
  eamad: remove use of MpegEncContext
  mpegvideo: remove unnecessary inclusions of faandct.h
  af_asyncts: avoid overflow in out_size with large delta values
  af_asyncts: add first_pts option

Conflicts:
configure
libavcodec/eamad.c
libavcodec/h264_ps.c
libavformat/crcenc.c
libavformat/ffmdec.c
libavformat/ffmenc.c
libavformat/framecrcenc.c
libavformat/md5enc.c
libavformat/nutdec.c
libavformat/rawenc.c
libavformat/yuv4mpeg.c
tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoImprove descriptiveness of a number of codec and container long names
Diego Biurrun [Tue, 24 Jul 2012 01:23:48 +0000 (03:23 +0200)]
Improve descriptiveness of a number of codec and container long names

6 years agolavfi: use correct PTS for link age.
Nicolas George [Mon, 30 Jul 2012 14:47:41 +0000 (16:47 +0200)]
lavfi: use correct PTS for link age.

When start_frame has returned, the buffer reference's PTS
may have been modified by another filter.

6 years agobuildsys: fix c++ compilation
Michael Niedermayer [Mon, 30 Jul 2012 15:44:56 +0000 (17:44 +0200)]
buildsys: fix c++ compilation

Based on code by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix forgotten hunk for framerate order change in ffmpeg.c
Michael Niedermayer [Mon, 30 Jul 2012 15:49:49 +0000 (17:49 +0200)]
fate: fix forgotten hunk for framerate order change in ffmpeg.c

broken by: cbb2c95e47cd83cb65b2ce77cbb0296e85fa506b
i had fixed that commit but pushed from an old branch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif: update frame rate
Michael Niedermayer [Mon, 30 Jul 2012 03:08:19 +0000 (05:08 +0200)]
yadif: update frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: init simple filter graph before trying to extract framerate from its output.
Michael Niedermayer [Mon, 30 Jul 2012 03:15:10 +0000 (05:15 +0200)]
ffmpeg: init simple filter graph before trying to extract framerate from its output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: fix minor typo
Michael Niedermayer [Mon, 30 Jul 2012 03:01:45 +0000 (05:01 +0200)]
avfilter: fix minor typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Drop pointless "format" from container long names
Diego Biurrun [Tue, 24 Jul 2012 21:51:41 +0000 (23:51 +0200)]
avformat: Drop pointless "format" from container long names

6 years agoaudioconvert: add av_get_standard_channel_layout().
Nicolas George [Mon, 30 Jul 2012 08:26:40 +0000 (10:26 +0200)]
audioconvert: add av_get_standard_channel_layout().

Also bump minor version and add APIchanges entry.

6 years agoaudioconvert: add av_get_channel_description().
Nicolas George [Sun, 29 Jul 2012 22:33:38 +0000 (00:33 +0200)]
audioconvert: add av_get_channel_description().

6 years agoaudioconvert: include the description of channels in the library.
Nicolas George [Sun, 29 Jul 2012 19:53:19 +0000 (21:53 +0200)]
audioconvert: include the description of channels in the library.

6 years agoflacdec: fix memleaks
Paul B Mahol [Sun, 29 Jul 2012 14:03:37 +0000 (14:03 +0000)]
flacdec: fix memleaks

While here refactor code.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosamplefmt: Fix warning about discarded qualifier
jamal [Fri, 27 Jul 2012 16:11:02 +0000 (13:11 -0300)]
samplefmt: Fix warning about discarded qualifier

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