ffmpeg.git
7 years agoFix compilation with libutvideo version 12.0.0
Stephen Hutchinson [Tue, 15 Jan 2013 00:15:10 +0000 (01:15 +0100)]
Fix compilation with libutvideo version 12.0.0

Reviewed-by: Derek Buitenhuis
7 years agoFix color filter example.
Carl Eugen Hoyos [Mon, 14 Jan 2013 23:14:35 +0000 (00:14 +0100)]
Fix color filter example.

Found-by: johnd and Paul B Mahol
7 years agox86/Makefile: move dirac_dwt to right type
Michael Niedermayer [Mon, 14 Jan 2013 22:40:26 +0000 (23:40 +0100)]
x86/Makefile: move dirac_dwt to right type

Fix build failure without yasm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/dirac: fix asm on win64
Michael Niedermayer [Mon, 14 Jan 2013 22:26:33 +0000 (23:26 +0100)]
x86/dirac: fix asm on win64

This could also be fixed by changing the argument type if
someone prefers that and wants to change it ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: split snow and dirac DWTs
Michael Niedermayer [Mon, 14 Jan 2013 21:30:30 +0000 (22:30 +0100)]
lavc: split snow and dirac DWTs

There is only about 4 lines of common code, so it alot cleaner
when seperated.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonuv: remove unused variable
Michael Niedermayer [Mon, 14 Jan 2013 15:37:12 +0000 (16:37 +0100)]
nuv: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoinit_get_bits: fix off by 1 error
Michael Niedermayer [Mon, 14 Jan 2013 15:29:27 +0000 (16:29 +0100)]
init_get_bits: fix off by 1 error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoinit_get_bits8: zero pointers & struct on error
Michael Niedermayer [Mon, 14 Jan 2013 15:23:39 +0000 (16:23 +0100)]
init_get_bits8: zero pointers & struct on error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoinit_get_bits8: check byte_size against being positive
Michael Niedermayer [Mon, 14 Jan 2013 15:22:41 +0000 (16:22 +0100)]
init_get_bits8: check byte_size against being positive

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoThe c99-to-c89 binaries are now hosted on videolan.org.
Carl Eugen Hoyos [Mon, 14 Jan 2013 15:28:44 +0000 (16:28 +0100)]
The c99-to-c89 binaries are now hosted on videolan.org.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 14 Jan 2013 14:53:25 +0000 (15:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmpproto: Fix assignments in if()
  lavf: Fix assignments in if()
  svq1enc: Fix assignments in if()
  lavc: Fix assignments in if() when calling ff_af_queue_add
  h264: Fix assignments in if()
  truemotion2: cosmetics, reformat

Conflicts:
libavcodec/svq1enc.c
libavcodec/truemotion2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'
Michael Niedermayer [Mon, 14 Jan 2013 14:45:05 +0000 (15:45 +0100)]
Merge commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef'

* commit 'df9036830b15997a3e9c3f2c632ed98d64f9deef':
  truemotion2: return meaningful error codes.
  tscc: remove some pointless comments and empty lines.
  tscc: return meaningful error codes.
  loco: cosmetics, reformat

Conflicts:
libavcodec/truemotion2.c
libavcodec/tscc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
Michael Niedermayer [Mon, 14 Jan 2013 14:36:35 +0000 (15:36 +0100)]
Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'

* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e':
  loco: return meaningful error codes.
  flicvideo: return meaningful error codes.
  vcr1: remove disabled encoder stub

Conflicts:
libavcodec/flicvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'
Michael Niedermayer [Mon, 14 Jan 2013 14:17:16 +0000 (15:17 +0100)]
Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'

* commit '74a9a624c5c4d50760d8d57458eba57366f6cb26':
  vcr1: return a meaningful error code.
  rpza: return a meaningful error code.
  qdrw: cosmetics, reformat

Conflicts:
libavcodec/qdrw.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '688b132b881d423877e38dc82f17e23a604be676'
Michael Niedermayer [Mon, 14 Jan 2013 14:04:58 +0000 (15:04 +0100)]
Merge commit '688b132b881d423877e38dc82f17e23a604be676'

* commit '688b132b881d423877e38dc82f17e23a604be676':
  qdrw: return meaningful error codes.
  qtrle: return a meaningful error code.
  gifdec: return meaningful error codes.
  interplayvideo: remove a static variable.
  interplayvideo: return meaningful error codes.
  lcldec: return meaningful error codes.
  targa: return meaningful error codes.
  qpeg: return a meaningful error code.
  nuv: return meaningful error codes.

Conflicts:
libavcodec/gifdec.c
libavcodec/interplayvideo.c
libavcodec/nuv.c
libavcodec/qpeg.c
libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'
Michael Niedermayer [Mon, 14 Jan 2013 13:36:17 +0000 (14:36 +0100)]
Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'

* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de':
  pcx: return meaningful error codes.
  tmv: return meaningful error codes.
  msrle: return meaningful error codes.
  cscd: return meaningful error codes.
  yadif: x86: fix build for compilers without aligned stack
  lavc: introduce the convenience function init_get_bits8
  lavc: check for overflow in init_get_bits

Conflicts:
libavcodec/cscd.c
libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'
Michael Niedermayer [Mon, 14 Jan 2013 13:16:21 +0000 (14:16 +0100)]
Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'

* commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1':
  avpacket: free side data in av_free_packet().
  v4l2: do not assert on a value received from outside of Libav
  v4l2: set the average framerate instead of codec timebase.

Conflicts:
libavcodec/avpacket.c
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'
Michael Niedermayer [Mon, 14 Jan 2013 12:59:09 +0000 (13:59 +0100)]
Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'

* commit '246da0b13551b1f80f067e4f258e5bd691f5ab33':
  v4l2: avoid pointless indirection.
  vdpau: Add VC-1 decoding via hwaccel infrastructure
  vdpau: Add H.264 decoding via hwaccel infrastructure

Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'
Michael Niedermayer [Mon, 14 Jan 2013 12:38:04 +0000 (13:38 +0100)]
Merge commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b'

* commit '200e8ac92007bc2fe30da05d3bd00ab620842a6b':
  vdpau: Add MPEG-4 decoding via hwaccel infrastructure
  vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure

Conflicts:
configure
libavcodec/Makefile
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'
Michael Niedermayer [Mon, 14 Jan 2013 12:29:00 +0000 (13:29 +0100)]
Merge commit '44e065d56c87d6a9d0effccec5f31517f72924ec'

* commit '44e065d56c87d6a9d0effccec5f31517f72924ec':
  vdpau: Add context and common helpers for hwaccel support

Conflicts:
Changelog
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmpproto: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:51 +0000 (00:07 +0100)]
rtmpproto: Fix assignments in if()

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavf: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:26 +0000 (00:07 +0100)]
lavf: Fix assignments in if()

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosvq1enc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:06:07 +0000 (00:06 +0100)]
svq1enc: Fix assignments in if()

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavc: Fix assignments in if() when calling ff_af_queue_add
Michael Niedermayer [Sun, 13 Jan 2013 23:02:50 +0000 (00:02 +0100)]
lavc: Fix assignments in if() when calling ff_af_queue_add

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoh264: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 22:44:01 +0000 (23:44 +0100)]
h264: Fix assignments in if()

Fixes null pointer dereference later, since if this function failed,
a positive return value was returned to the caller.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotruemotion2: cosmetics, reformat
Anton Khirnov [Tue, 20 Nov 2012 06:43:00 +0000 (07:43 +0100)]
truemotion2: cosmetics, reformat

7 years agotruemotion2: return meaningful error codes.
Anton Khirnov [Tue, 20 Nov 2012 06:31:08 +0000 (07:31 +0100)]
truemotion2: return meaningful error codes.

7 years agotscc: remove some pointless comments and empty lines.
Anton Khirnov [Tue, 20 Nov 2012 06:14:51 +0000 (07:14 +0100)]
tscc: remove some pointless comments and empty lines.

7 years agotscc: return meaningful error codes.
Anton Khirnov [Tue, 20 Nov 2012 06:13:49 +0000 (07:13 +0100)]
tscc: return meaningful error codes.

7 years agoloco: cosmetics, reformat
Anton Khirnov [Mon, 19 Nov 2012 17:48:15 +0000 (18:48 +0100)]
loco: cosmetics, reformat

7 years agoloco: return meaningful error codes.
Anton Khirnov [Mon, 19 Nov 2012 17:43:40 +0000 (18:43 +0100)]
loco: return meaningful error codes.

7 years agoflicvideo: return meaningful error codes.
Anton Khirnov [Mon, 19 Nov 2012 17:24:27 +0000 (18:24 +0100)]
flicvideo: return meaningful error codes.

7 years agovcr1: remove disabled encoder stub
Anton Khirnov [Mon, 19 Nov 2012 17:09:27 +0000 (18:09 +0100)]
vcr1: remove disabled encoder stub

7 years agovcr1: return a meaningful error code.
Anton Khirnov [Mon, 19 Nov 2012 17:03:31 +0000 (18:03 +0100)]
vcr1: return a meaningful error code.

7 years agorpza: return a meaningful error code.
Anton Khirnov [Mon, 19 Nov 2012 09:52:33 +0000 (10:52 +0100)]
rpza: return a meaningful error code.

7 years agoqdrw: cosmetics, reformat
Anton Khirnov [Mon, 19 Nov 2012 09:40:03 +0000 (10:40 +0100)]
qdrw: cosmetics, reformat

7 years agoqdrw: return meaningful error codes.
Anton Khirnov [Mon, 19 Nov 2012 09:38:03 +0000 (10:38 +0100)]
qdrw: return meaningful error codes.

7 years agoqtrle: return a meaningful error code.
Anton Khirnov [Mon, 19 Nov 2012 09:33:54 +0000 (10:33 +0100)]
qtrle: return a meaningful error code.

7 years agogifdec: return meaningful error codes.
Anton Khirnov [Mon, 19 Nov 2012 09:30:01 +0000 (10:30 +0100)]
gifdec: return meaningful error codes.

7 years agointerplayvideo: remove a static variable.
Anton Khirnov [Mon, 19 Nov 2012 09:09:54 +0000 (10:09 +0100)]
interplayvideo: remove a static variable.

7 years agointerplayvideo: return meaningful error codes.
Anton Khirnov [Mon, 19 Nov 2012 08:21:15 +0000 (09:21 +0100)]
interplayvideo: return meaningful error codes.

7 years agolcldec: return meaningful error codes.
Anton Khirnov [Sun, 18 Nov 2012 17:53:46 +0000 (18:53 +0100)]
lcldec: return meaningful error codes.

7 years agotarga: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 17:31:20 +0000 (18:31 +0100)]
targa: return meaningful error codes.

7 years agoqpeg: return a meaningful error code.
Anton Khirnov [Sat, 17 Nov 2012 17:17:54 +0000 (18:17 +0100)]
qpeg: return a meaningful error code.

7 years agonuv: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 17:07:42 +0000 (18:07 +0100)]
nuv: return meaningful error codes.

7 years agopcx: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 16:57:06 +0000 (17:57 +0100)]
pcx: return meaningful error codes.

7 years agotmv: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 16:52:52 +0000 (17:52 +0100)]
tmv: return meaningful error codes.

7 years agomsrle: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 16:48:38 +0000 (17:48 +0100)]
msrle: return meaningful error codes.

7 years agocscd: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 14:45:41 +0000 (15:45 +0100)]
cscd: return meaningful error codes.

7 years agoyadif: x86: fix build for compilers without aligned stack
Daniel Kang [Sun, 13 Jan 2013 17:12:18 +0000 (12:12 -0500)]
yadif: x86: fix build for compilers without aligned stack

Manually load registers to avoid using 8 registers on x86_32 with
compilers that do not align the stack (e.g. MSVC).

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agortmpproto: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:51 +0000 (00:07 +0100)]
rtmpproto: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/mux: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:26 +0000 (00:07 +0100)]
lavf/mux: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovsrc_testsrc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:07:02 +0000 (00:07 +0100)]
vsrc_testsrc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiff: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:06:44 +0000 (00:06 +0100)]
tiff: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1enc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:06:07 +0000 (00:06 +0100)]
svq1enc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agora144enc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:05:42 +0000 (00:05 +0100)]
ra144enc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonellymoserenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:05:30 +0000 (00:05 +0100)]
nellymoserenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvorbisenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:59 +0000 (00:04 +0100)]
libvorbisenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvo-aacenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:41 +0000 (00:04 +0100)]
libvo-aacenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibspeexenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:25 +0000 (00:04 +0100)]
libspeexenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibopencore-amr: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:04:13 +0000 (00:04 +0100)]
libopencore-amr: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:03:38 +0000 (00:03 +0100)]
libmp3lame: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibfdk-aacenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:03:23 +0000 (00:03 +0100)]
libfdk-aacenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibfaac: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:03:09 +0000 (00:03 +0100)]
libfaac: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacenc: Fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:02:50 +0000 (00:02 +0100)]
aacenc: Fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/examples: fix assignments in if()
Michael Niedermayer [Sun, 13 Jan 2013 23:01:40 +0000 (00:01 +0100)]
doc/examples: fix assignments in if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: introduce the convenience function init_get_bits8
Luca Barbato [Sun, 13 Jan 2013 22:37:11 +0000 (23:37 +0100)]
lavc: introduce the convenience function init_get_bits8

Accept the buffer size in bytes and check for overflow before passing
the value in bits to init_get_bits.

7 years agolavc: check for overflow in init_get_bits
Luca Barbato [Sun, 13 Jan 2013 18:52:45 +0000 (19:52 +0100)]
lavc: check for overflow in init_get_bits

Fix an undefined behaviour and make the function return a proper
error in case of overflow.

CC: libav-stable@libav.org
7 years agoh264: don t leave stale pointers in delayed_pic in flush_changes.
Michael Niedermayer [Mon, 14 Jan 2013 01:54:16 +0000 (02:54 +0100)]
h264: don t leave stale pointers in delayed_pic in flush_changes.

Fixes null pointer dereference & assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr/dither: fix division by 0
Michael Niedermayer [Mon, 14 Jan 2013 00:06:48 +0000 (01:06 +0100)]
swr/dither: fix division by 0

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix () placement
Michael Niedermayer [Sun, 13 Jan 2013 22:44:01 +0000 (23:44 +0100)]
h264: fix () placement

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: fix sws_flags
Michael Niedermayer [Mon, 31 Dec 2012 17:30:03 +0000 (18:30 +0100)]
ffplay: fix sws_flags

Fixes Ticket45

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: fix handling of timestamps that cause multiple drops or silence injections
Michael Niedermayer [Sun, 13 Jan 2013 17:39:06 +0000 (18:39 +0100)]
swr: fix handling of timestamps that cause multiple drops or silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavpacket: free side data in av_free_packet().
Anton Khirnov [Wed, 31 Oct 2012 05:42:08 +0000 (06:42 +0100)]
avpacket: free side data in av_free_packet().

Freeing it in av_destruct_packet(), as is done currently, would mean
that we allow it to be allocated with other means. But that would make
av_packet_new_side_data() unsafe.

Side data is not expected to be large, so copying it if required
shouldn't be a problem.

7 years agov4l2: do not assert on a value received from outside of Libav
Anton Khirnov [Tue, 8 Jan 2013 07:04:59 +0000 (08:04 +0100)]
v4l2: do not assert on a value received from outside of Libav

7 years agov4l2: set the average framerate instead of codec timebase.
Anton Khirnov [Mon, 7 Jan 2013 17:54:50 +0000 (18:54 +0100)]
v4l2: set the average framerate instead of codec timebase.

Codec timebase is supposed to be set by decoders only.

7 years agov4l2: avoid pointless indirection.
Anton Khirnov [Mon, 7 Jan 2013 17:35:48 +0000 (18:35 +0100)]
v4l2: avoid pointless indirection.

v4l2_read_header() does no cleanup, so it can return directly, without
any need for goto.

7 years agoswr: limit buffer size for silence injection
Michael Niedermayer [Sun, 13 Jan 2013 14:57:56 +0000 (15:57 +0100)]
swr: limit buffer size for silence injection

This reduces memory usage for unreasonable large silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: limit buffer size for discarding.
Michael Niedermayer [Sun, 13 Jan 2013 14:53:01 +0000 (15:53 +0100)]
swr: limit buffer size for discarding.

This prevents insane memory usage in case of insane input values.
Untested due to lack of a testcase that causes such insane allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: extend documentation for the -vf option
Stefano Sabatini [Sun, 13 Jan 2013 14:23:15 +0000 (15:23 +0100)]
ffplay: extend documentation for the -vf option

In particular, make it consistent with the ffmpeg docs.

7 years agoswr: move silence buffer to context to avoid per use malloc/free
Michael Niedermayer [Sun, 13 Jan 2013 14:26:04 +0000 (15:26 +0100)]
swr: move silence buffer to context to avoid per use malloc/free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: move buffer used to discard sample to context
Michael Niedermayer [Sun, 13 Jan 2013 14:21:33 +0000 (15:21 +0100)]
swr: move buffer used to discard sample to context

This avoids the need to allocate & free to repeatly

Fixes Ticket2122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: clarify/extend documentation for AVFormatContext::analyzeduration
Stefano Sabatini [Sat, 12 Jan 2013 15:16:36 +0000 (16:16 +0100)]
lavf: clarify/extend documentation for AVFormatContext::analyzeduration

"analyzeduration" is not used to detect the input duration, but to
specify the max probe data duration. Fix option description and related
doc entry accordingly.

7 years agolavf/utils: clarify/extend messages in avformat_find_stream_info()
Stefano Sabatini [Sat, 12 Jan 2013 15:14:53 +0000 (16:14 +0100)]
lavf/utils: clarify/extend messages in avformat_find_stream_info()

In particular, specify the unit of the shown values in case the max probe
size/duration is reached.

7 years agodoc/ffmpeg: extend documentation for the -filter options and -af/vf aliases
Stefano Sabatini [Fri, 11 Jan 2013 23:52:52 +0000 (00:52 +0100)]
doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases

7 years agodoc/texipod: add rule to correctly interpret @ref{ANCHOR,XREF,SECTION_NAME,...}
Stefano Sabatini [Fri, 11 Jan 2013 23:53:42 +0000 (00:53 +0100)]
doc/texipod: add rule to correctly interpret @ref{ANCHOR,XREF,SECTION_NAME,...}

This allows to name an internal reference in the POD/MAN output.

7 years agovdpau: Add VC-1 decoding via hwaccel infrastructure
Rémi Denis-Courmont [Sat, 12 Jan 2013 15:53:47 +0000 (17:53 +0200)]
vdpau: Add VC-1 decoding via hwaccel infrastructure

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovdpau: Add H.264 decoding via hwaccel infrastructure
Rémi Denis-Courmont [Sat, 12 Jan 2013 15:53:46 +0000 (17:53 +0200)]
vdpau: Add H.264 decoding via hwaccel infrastructure

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovdpau: Add MPEG-4 decoding via hwaccel infrastructure
Rémi Denis-Courmont [Sat, 12 Jan 2013 15:53:45 +0000 (17:53 +0200)]
vdpau: Add MPEG-4 decoding via hwaccel infrastructure

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovdpau: Add MPEG-1/2 decoding via hwaccel infrastructure
Rémi Denis-Courmont [Sat, 12 Jan 2013 15:53:44 +0000 (17:53 +0200)]
vdpau: Add MPEG-1/2 decoding via hwaccel infrastructure

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovdpau: Add context and common helpers for hwaccel support
Rémi Denis-Courmont [Sat, 12 Jan 2013 15:53:43 +0000 (17:53 +0200)]
vdpau: Add context and common helpers for hwaccel support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agolavfi/gradfun: support YUV440P
Paul B Mahol [Sun, 13 Jan 2013 11:06:45 +0000 (11:06 +0000)]
lavfi/gradfun: support YUV440P

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 13 Jan 2013 13:05:55 +0000 (14:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Send a valid "delay since SR" value in the RTCP RR packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e568db40258d549777ac1c16971678e18a18f5f5'
Michael Niedermayer [Sun, 13 Jan 2013 13:00:08 +0000 (14:00 +0100)]
Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'

* commit 'e568db40258d549777ac1c16971678e18a18f5f5':
  rtpdec: Calculate and report packet reception jitter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'
Michael Niedermayer [Sun, 13 Jan 2013 12:54:32 +0000 (13:54 +0100)]
Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8'

* commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8':
  rtpdec: Fix the calculation of expected number of packets
  fate: vp3: Fix fate-vp3-coeff-level64 test dependencies

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
Michael Niedermayer [Sun, 13 Jan 2013 12:42:10 +0000 (13:42 +0100)]
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
  fate: cosmetics: Order some test entries

Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopthread: Do not use a half updated context as master for deallocation.
Michael Niedermayer [Sun, 13 Jan 2013 04:42:01 +0000 (05:42 +0100)]
pthread: Do not use a half updated context as master for deallocation.

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvdsubenc: use unsigned shifts to avoid shifting into the sign bit
Michael Niedermayer [Sat, 12 Jan 2013 20:40:41 +0000 (21:40 +0100)]
dvdsubenc: use unsigned shifts to avoid shifting into the sign bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvdsubdec: use unsigned shifts to avoid shifting into the sign bit
Michael Niedermayer [Sat, 12 Jan 2013 20:38:19 +0000 (21:38 +0100)]
dvdsubdec: use unsigned shifts to avoid shifting into the sign bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: work with 4 noise shaping coeffs at a time
Michael Niedermayer [Sat, 12 Jan 2013 18:11:08 +0000 (19:11 +0100)]
swr: work with 4 noise shaping coeffs at a time

63->38 kcycles

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