ffmpeg.git
5 years agoMake new VDPAU easier to use by adding context to callback.
Reimar Döffinger [Wed, 7 Aug 2013 19:22:48 +0000 (21:22 +0200)]
Make new VDPAU easier to use by adding context to callback.

Using VDPAU correctly means checking for preemption
and possibly regenerating the context all the time.
With the current API there is no context or other
user-defined pointer and thus this in not possible
during decoding unless using some hack like global
variables.
The need to reinitialize both surfaces and even function
pointers makes handling preemption even more difficult.
This patch introduces a new render2 function that gets
both the AVCodecContext and AVFrame in addition,
in both the user can store additional opaque data.
This allows even advanced approaches like keeping a
"generation counter" for the surfaces so they can be
regenerated on the fly and efficiently.
In addition, the function has a return value that will
be passed through all the way instead of being silently
ignored as for the current render function.
Unfortunately the HWAccel API has no way of providing
API/ABI compatibility, so a currently disallowed
state (render pointer being NULL) is used to extend it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agovdpau: Add an allocation function for AVVDPAUContext.
Reimar Döffinger [Sun, 11 Aug 2013 09:21:50 +0000 (11:21 +0200)]
vdpau: Add an allocation function for AVVDPAUContext.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agovdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU.
Reimar Döffinger [Sun, 11 Aug 2013 09:11:53 +0000 (11:11 +0200)]
vdpau_internal.h: Add missing include for FF_API_BUFS_VDPAU.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agosanm: fix undefined behaviour on big-endian.
Reimar Döffinger [Sun, 11 Aug 2013 09:06:41 +0000 (11:06 +0200)]
sanm: fix undefined behaviour on big-endian.

A variable with post-increment may only appear
once in a statement.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agotiff: continue parsing on non fatal errors
Michael Niedermayer [Sun, 11 Aug 2013 12:16:09 +0000 (14:16 +0200)]
tiff: continue parsing on non fatal errors

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg4videodec: Parse newpred headers
Michael Niedermayer [Sun, 11 Aug 2013 15:35:30 +0000 (17:35 +0200)]
mpeg4videodec: Parse newpred headers

This is untested due to lack of a non broken file using new pred

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg4videodec: check resolution marker bits
Michael Niedermayer [Sun, 11 Aug 2013 15:34:29 +0000 (17:34 +0200)]
mpeg4videodec: check resolution marker bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/avstring: make const tables static const
Michael Niedermayer [Sun, 11 Aug 2013 14:50:58 +0000 (16:50 +0200)]
avutil/avstring: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/parseutils:make const tables static const
Michael Niedermayer [Sun, 11 Aug 2013 14:50:24 +0000 (16:50 +0200)]
avutil/parseutils:make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/ripemd:make const tables static const
Michael Niedermayer [Sun, 11 Aug 2013 14:49:57 +0000 (16:49 +0200)]
avutil/ripemd:make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/xtea: make const tables static const
Michael Niedermayer [Sun, 11 Aug 2013 14:49:36 +0000 (16:49 +0200)]
avutil/xtea: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/sha:make const tables static const
Michael Niedermayer [Sun, 11 Aug 2013 14:49:21 +0000 (16:49 +0200)]
avutil/sha:make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/sha512: make const tables static const
Michael Niedermayer [Sun, 11 Aug 2013 14:49:03 +0000 (16:49 +0200)]
avutil/sha512: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCII
Mark Harris [Sun, 11 Aug 2013 00:03:11 +0000 (17:03 -0700)]
avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCII

This makes the encoding of picture descriptions consistent with the
encoding of other text id3 tags and works better with iTunes, which
does not display pictures with some UTF-16 picture descriptions
(including a UTF-16 empty string, i.e. BOM + terminator).  It also
saves a few bytes.

Example:
 ffmpeg -f lavfi -i sine=b=4 -f lavfi -i smptebars -map 0:a -map 1:v \
   -codec:a libmp3lame -codec:v mjpeg -id3v2_version 3 \
   -metadata:s:v comment="Cover (front)" -t 3 -y out.mp3

This example does not set a picture description (-metadata:s:v title=)
so an empty string is written in the id3v2.3 APIC frame.  Without this
patch, UTF-16 is used and the cover art does not display in iTunes.
With the patch the cover art is displayed.  (Note that iTunes does not
display or have a way to set picture descriptions, only the picture
itself, but nevertheless has trouble skipping some UTF-16 descriptions.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 11 Aug 2013 09:54:32 +0000 (11:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Do not misuse memcmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
Michael Niedermayer [Sun, 11 Aug 2013 09:49:47 +0000 (11:49 +0200)]
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'

* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'
Michael Niedermayer [Sun, 11 Aug 2013 09:33:49 +0000 (11:33 +0200)]
Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'

* commit 'd175a5730b42166704b7262b33f4b780d9d92f60':
  doc: Add an example on publishing over RTMP
  doc: Add librtmp to the section header for the librtmp specific details

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a435ca5b4d9efebf0759220681010977c36615f7'
Michael Niedermayer [Sun, 11 Aug 2013 09:28:50 +0000 (11:28 +0200)]
Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'

* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
  doc: Explain that the default RTMP user agent is different when publishing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'
Michael Niedermayer [Sun, 11 Aug 2013 09:24:09 +0000 (11:24 +0200)]
Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'

* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec':
  doc: Extend the rtmp example to include how to pass username/password

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8e1fe345577a42f99591caf8a06c447613449694'
Michael Niedermayer [Sun, 11 Aug 2013 09:17:38 +0000 (11:17 +0200)]
Merge commit '8e1fe345577a42f99591caf8a06c447613449694'

* commit '8e1fe345577a42f99591caf8a06c447613449694':
  rtmp: Detect and warn if the user tries to pass librtmp style parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'
Michael Niedermayer [Sun, 11 Aug 2013 09:11:31 +0000 (11:11 +0200)]
Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'

* commit 'ba5393a609c723ec8ab7f9727c10fef734c09278':
  rtmp: rename data_size to size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'
Michael Niedermayer [Sun, 11 Aug 2013 09:02:28 +0000 (11:02 +0200)]
Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'

* commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b':
  rtmp: Use PRId64 when needed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avpacket: Fix memory allocation failure check
Michael Niedermayer [Sun, 11 Aug 2013 08:56:07 +0000 (10:56 +0200)]
avcodec/avpacket: Fix memory allocation failure check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'
Michael Niedermayer [Sun, 11 Aug 2013 08:45:13 +0000 (10:45 +0200)]
Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'

* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
  lavc: Add refcounted api to AVPacket

Conflicts:
libavcodec/avpacket.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'
Michael Niedermayer [Sun, 11 Aug 2013 08:35:44 +0000 (10:35 +0200)]
Merge commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e'

* commit 'c1076d8479a6c0ee2e0c4b0e2151df5b0228438e':
  h264: check one context_init() allocation

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'
Michael Niedermayer [Sun, 11 Aug 2013 08:28:49 +0000 (10:28 +0200)]
Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'

* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
  h264: use explicit variable names for *_field_flag

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosvq3: Fix ff_h264_check_intra_pred_mode() return code check
Michael Niedermayer [Sun, 11 Aug 2013 08:21:44 +0000 (10:21 +0200)]
svq3: Fix ff_h264_check_intra_pred_mode() return code check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'
Michael Niedermayer [Sun, 11 Aug 2013 08:08:48 +0000 (10:08 +0200)]
Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'

* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmp: Do not misuse memcmp
Luca Barbato [Thu, 8 Aug 2013 17:44:19 +0000 (19:44 +0200)]
rtmp: Do not misuse memcmp

CC: libav-stable@libav.org
5 years agolavu: fix grammar in doxy for av_frame_ref.
Thilo Borgmann [Sat, 10 Aug 2013 17:35:31 +0000 (19:35 +0200)]
lavu: fix grammar in doxy for av_frame_ref.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd: Fix make checkheaders
James Almer [Sat, 10 Aug 2013 21:47:23 +0000 (18:47 -0300)]
lavd: Fix make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobprint: Include va_copy compat
Derek Buitenhuis [Sat, 10 Aug 2013 19:53:32 +0000 (15:53 -0400)]
bprint: Include va_copy compat

Fixes build with MSVC and ICL.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agotests/fli: avoid rounding errors in -t option.
Nicolas George [Sat, 10 Aug 2013 17:27:07 +0000 (19:27 +0200)]
tests/fli: avoid rounding errors in -t option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: make const tables static const
Michael Niedermayer [Sat, 10 Aug 2013 16:32:31 +0000 (18:32 +0200)]
avutil/opt: make const tables static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: fix av_log type
Michael Niedermayer [Sat, 10 Aug 2013 16:32:06 +0000 (18:32 +0200)]
avutil/opt: fix av_log type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/tedcaptionsdec: make const arrays static const
Michael Niedermayer [Sat, 10 Aug 2013 16:31:38 +0000 (18:31 +0200)]
avformat/tedcaptionsdec: make const arrays static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/f_sendcmd: make const arrays static const
Michael Niedermayer [Sat, 10 Aug 2013 16:31:20 +0000 (18:31 +0200)]
avfilter/f_sendcmd: make const arrays static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: Use bprint for part
Michael Niedermayer [Sat, 10 Aug 2013 11:52:53 +0000 (13:52 +0200)]
avutil/log: Use bprint for part

This should fix the issue with strings longer than 1024

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Clarify the avconv section about -re
Martin Storsjö [Sat, 10 Aug 2013 09:13:08 +0000 (12:13 +0300)]
doc: Clarify the avconv section about -re

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc: Add an example on publishing over RTMP
Martin Storsjö [Sat, 10 Aug 2013 09:08:43 +0000 (12:08 +0300)]
doc: Add an example on publishing over RTMP

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc: Explain that the default RTMP user agent is different when publishing
Martin Storsjö [Sat, 10 Aug 2013 08:51:49 +0000 (11:51 +0300)]
doc: Explain that the default RTMP user agent is different when publishing

The fact that a different user agent is used is cruicial for getting
publishing authentication working. (When using librtmp, this other
user agent has to be specified manually, but that's not needed
with the libavformat internal RTMP support.)

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc: Extend the rtmp example to include how to pass username/password
Martin Storsjö [Sat, 10 Aug 2013 08:51:31 +0000 (11:51 +0300)]
doc: Extend the rtmp example to include how to pass username/password

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agodoc: Add librtmp to the section header for the librtmp specific details
Martin Storsjö [Sat, 10 Aug 2013 09:03:54 +0000 (12:03 +0300)]
doc: Add librtmp to the section header for the librtmp specific details

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortmp: Detect and warn if the user tries to pass librtmp style parameters
Martin Storsjö [Sat, 10 Aug 2013 08:53:31 +0000 (11:53 +0300)]
rtmp: Detect and warn if the user tries to pass librtmp style parameters

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavutil/bprint: add av_vbprintf()
Michael Niedermayer [Sat, 10 Aug 2013 11:52:14 +0000 (13:52 +0200)]
avutil/bprint: add av_vbprintf()

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmp: rename data_size to size
Luca Barbato [Thu, 8 Aug 2013 16:52:11 +0000 (18:52 +0200)]
rtmp: rename data_size to size

5 years agortmp: Use PRId64 when needed.
Luca Barbato [Thu, 8 Aug 2013 15:43:15 +0000 (17:43 +0200)]
rtmp: Use PRId64 when needed.

5 years agolavc: Add refcounted api to AVPacket
Luca Barbato [Wed, 10 Jul 2013 08:52:56 +0000 (10:52 +0200)]
lavc: Add refcounted api to AVPacket

Provide a clean way to manipulate packets.

5 years agoh264: check one context_init() allocation
Vittorio Giovara [Fri, 2 Aug 2013 16:36:28 +0000 (18:36 +0200)]
h264: check one context_init() allocation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoh264: use explicit variable names for *_field_flag
Vittorio Giovara [Fri, 2 Aug 2013 16:36:29 +0000 (18:36 +0200)]
h264: use explicit variable names for *_field_flag

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoh264: return meaningful values
Vittorio Giovara [Fri, 2 Aug 2013 16:36:27 +0000 (18:36 +0200)]
h264: return meaningful values

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 10 Aug 2013 08:41:46 +0000 (10:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavutil: Make avpriv_open a library-internal function on msvcrt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'
Michael Niedermayer [Sat, 10 Aug 2013 08:36:18 +0000 (10:36 +0200)]
Merge commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa'

* commit 'a76d0cdf21c3d9e464623cc0ad1c005abf952afa':
  libavutil: Move avpriv_open to a new file, file_open.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'
Michael Niedermayer [Sat, 10 Aug 2013 08:29:40 +0000 (10:29 +0200)]
Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

* commit 'cb0244daaca83ab666798818f74f5181bf6bc387':
  bktr: Changed a missed occurrance of open into avpriv_open

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e'
Michael Niedermayer [Sat, 10 Aug 2013 08:24:28 +0000 (10:24 +0200)]
Merge commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e'

* commit '33237123c83bf4f8345e6ac889ad2e7dbd303d0e':
  libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'
Michael Niedermayer [Sat, 10 Aug 2013 08:18:18 +0000 (10:18 +0200)]
Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'

* commit '9d5ec50ead97e088d77317e77b18cef06cb3d053':
  ff_socket: put out-of-line and fallback to fcntl() for close-on-exec

Conflicts:
libavformat/network.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: fix sine sample_rate abbreviation
Mark Harris [Sat, 10 Aug 2013 03:26:16 +0000 (20:26 -0700)]
doc/filters: fix sine sample_rate abbreviation

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc: apply various grammar fixes
Bryce W. Harrington [Sat, 10 Aug 2013 02:19:53 +0000 (02:19 +0000)]
doc: apply various grammar fixes

The first sentence of each of the modified man pages are worded a bit
awkwardly. These minor copy-edits should make them clearer.

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoIntegrate accessors.h header into internal.h
Reimar Döffinger [Fri, 9 Aug 2013 18:50:29 +0000 (20:50 +0200)]
Integrate accessors.h header into internal.h

I have no idea why I added a separate header,
I think there is no good reason for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agolibavutil: Make avpriv_open a library-internal function on msvcrt
Martin Storsjö [Fri, 9 Aug 2013 08:06:46 +0000 (11:06 +0300)]
libavutil: Make avpriv_open a library-internal function on msvcrt

Add one copy of the function into each of the libraries, similarly
to what we do for log2_tab. When using static libs, only one
copy of the file_open.o object file gets included, while when
using shared libraries, each of them get a copy of its own.

This fixes DLL builds with a statically linked C runtime, where
each DLL effectively has got its own instance of the C runtime,
where file descriptors can't be shared across runtimes.

On systems not using msvcrt, the function is not duplicated.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavutil: Move avpriv_open to a new file, file_open.c
Martin Storsjö [Fri, 9 Aug 2013 07:58:15 +0000 (10:58 +0300)]
libavutil: Move avpriv_open to a new file, file_open.c

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agobktr: Changed a missed occurrance of open into avpriv_open
Martin Storsjö [Fri, 9 Aug 2013 07:16:57 +0000 (10:16 +0300)]
bktr: Changed a missed occurrance of open into avpriv_open

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolibavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well
Martin Storsjö [Thu, 8 Aug 2013 14:16:26 +0000 (17:16 +0300)]
libavutil: Enable the MSVC DLL symbol loading workaround in shared builds as well

This used to only be necessary in static builds (when using the
dynamically linked C runtime), since the _imp prefixed symbols do
exist when linking to the actual DLL. When building testprogs,
however, the current library (e.g. libavutil for some of the testprogs)
is linked statically.

This fixes make fate on DLL builds when using the dynamically
linked C runtime.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/raw: gbrp support
Michael Niedermayer [Fri, 9 Aug 2013 20:46:49 +0000 (22:46 +0200)]
avcodec/raw: gbrp support

Fixes 2nd half of Ticket2274

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nut: support planar rgb
Michael Niedermayer [Fri, 9 Aug 2013 20:42:28 +0000 (22:42 +0200)]
avformat/nut: support planar rgb

Fixes first half of Ticket2274

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: remove redundant check
Michael Niedermayer [Fri, 9 Aug 2013 12:53:55 +0000 (14:53 +0200)]
avcodec/tiff: remove redundant check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: avoid seek back on reading tags
Michael Niedermayer [Fri, 9 Aug 2013 12:53:13 +0000 (14:53 +0200)]
avcodec/tiff: avoid seek back on reading tags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/mem: Fix flipped condition
Michael Niedermayer [Fri, 9 Aug 2013 11:37:18 +0000 (13:37 +0200)]
avutil/mem: Fix flipped condition

Fixes return code and later null pointer dereference

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/paf: Fix integer overflow and out of array read
Michael Niedermayer [Fri, 9 Aug 2013 11:23:10 +0000 (13:23 +0200)]
avformat/paf: Fix integer overflow and out of array read

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/trim: Fix assertion failure with empty frames
Michael Niedermayer [Fri, 9 Aug 2013 09:51:20 +0000 (11:51 +0200)]
avfilter/trim: Fix assertion failure with empty frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoff_socket: put out-of-line and fallback to fcntl() for close-on-exec
Rémi Denis-Courmont [Thu, 8 Aug 2013 19:26:42 +0000 (22:26 +0300)]
ff_socket: put out-of-line and fallback to fcntl() for close-on-exec

This supports non-Linux systems (SOCK_CLOEXEC is non-standard) and
older Linux kernels to the extent possible.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/fifo: explicitly assert that a frame should have become available after...
Michael Niedermayer [Fri, 9 Aug 2013 07:28:11 +0000 (09:28 +0200)]
avfilter/fifo: explicitly assert that a frame should have become available after request

May help tools like coverity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 9 Aug 2013 06:53:22 +0000 (08:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a TAK test

Conflicts:
tests/fate/lossless-audio.mak

No change as we already have a tak test with luckynight-partial.tak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'
Michael Niedermayer [Fri, 9 Aug 2013 05:16:31 +0000 (07:16 +0200)]
Merge commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132'

* commit 'dfc6b5c81491abf7effb97b23af17ccf7adcd132':
  file: Move win32 utf8->wchar open wrapper to libavutil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: check for filter EOF return codes
Marton Balint [Sun, 4 Aug 2013 19:07:16 +0000 (21:07 +0200)]
ffplay: check for filter EOF return codes

Fixes ticket #2800.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: ensure the decoder is flushed before exiting or looping
Marton Balint [Tue, 16 Jul 2013 01:04:22 +0000 (03:04 +0200)]
ffplay: ensure the decoder is flushed before exiting or looping

Also make sure that we only exit or restart the video if it is not paused and
if the picture queue is empty.

There is still room for improvement (filters may also buffer some frames), but
the patch fixes the most common use cases and ticket #2783 as well.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: fix memleak of non-bitmap subtitles
Marton Balint [Sun, 4 Aug 2013 16:49:02 +0000 (18:49 +0200)]
ffplay: fix memleak of non-bitmap subtitles

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: free subtitle pictures on exit
Marton Balint [Sun, 28 Jul 2013 15:32:54 +0000 (17:32 +0200)]
ffplay: free subtitle pictures on exit

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavfilter/vf_perspective: factor u cliping code
Michael Niedermayer [Thu, 8 Aug 2013 21:24:31 +0000 (23:24 +0200)]
avfilter/vf_perspective: factor u cliping code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add Alexander Strasser for the server
Michael Niedermayer [Thu, 8 Aug 2013 20:55:19 +0000 (22:55 +0200)]
MAINTAINERS: add Alexander Strasser for the server

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFATE: add a TAK test
Anton Khirnov [Tue, 6 Aug 2013 07:40:54 +0000 (09:40 +0200)]
FATE: add a TAK test

5 years agoReduce MAKE_ACCESSORS code duplication via a new header.
Reimar Döffinger [Thu, 8 Aug 2013 18:02:46 +0000 (20:02 +0200)]
Reduce MAKE_ACCESSORS code duplication via a new header.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoMAINTAINERS: remove myself from movenc, 2 maintainers should be enough
Michael Niedermayer [Thu, 8 Aug 2013 14:40:19 +0000 (16:40 +0200)]
MAINTAINERS: remove myself from movenc, 2 maintainers should be enough

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c
Matthieu Bouron [Tue, 6 Aug 2013 21:08:05 +0000 (22:08 +0100)]
MAINTAINERS: add myself as maintainer for lavf/aiff* and lavf/movenc.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofile: Move win32 utf8->wchar open wrapper to libavutil
Martin Storsjö [Thu, 8 Aug 2013 08:29:57 +0000 (11:29 +0300)]
file: Move win32 utf8->wchar open wrapper to libavutil

When libavformat was changed to use the new avpriv_open function
in 51eb213d001, this silently bypassed the existing wrapper for
win32. Move the win32 wrapper into libavutil/file.c to make sure
it gets called everywhere (not just in the libavformat case).

This makes sure that non-ascii file names gets opened properly
(where file names internally are stored as utf8, but they get
converted to wchar_t and opened with _wsopen).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/bitstream: Dont try to free buffers for static VLCs
Michael Niedermayer [Thu, 8 Aug 2013 13:05:48 +0000 (15:05 +0200)]
avcodec/bitstream: Dont try to free buffers for static VLCs

Such buffers are not malloced thus freeing would be bad.
Note though this condition never could have happened so this
is more for correctness sake and not a true bugfix

Fixes CID1061047

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 8 Aug 2013 10:51:46 +0000 (12:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add assembly version of h264_find_start_code_candidate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'
Michael Niedermayer [Thu, 8 Aug 2013 10:38:10 +0000 (12:38 +0200)]
Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'

* commit '218d6844b37d339ffbf2044ad07d8be7767e2734':
  h264dsp: Factorize code into a new function, h264_find_start_code_candidate

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7a82022ee2f9b1fad991ace0936901e7419444be'
Michael Niedermayer [Thu, 8 Aug 2013 10:28:57 +0000 (12:28 +0200)]
Merge commit '7a82022ee2f9b1fad991ace0936901e7419444be'

* commit '7a82022ee2f9b1fad991ace0936901e7419444be':
  h264_parser: Initialize the h264dsp context in the parser as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3e5898782dce60334ab294821ca00b19c648cf66'
Michael Niedermayer [Thu, 8 Aug 2013 10:10:39 +0000 (12:10 +0200)]
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'
Michael Niedermayer [Thu, 8 Aug 2013 10:04:46 +0000 (12:04 +0200)]
Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'

* commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0':
  avio: Add const qualifiers to ffio_read_indirect

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'
Michael Niedermayer [Thu, 8 Aug 2013 09:54:10 +0000 (11:54 +0200)]
Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

* commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520':
  libavutil: Don't use fcntl if the function does not exist
  cmdutils: Only do the windows-specific commandline parsing on _WIN32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'
Michael Niedermayer [Thu, 8 Aug 2013 09:47:07 +0000 (11:47 +0200)]
Merge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'

* commit '51eb213d00154b8e7856c7667ea62db8b0f663d4':
  libavformat: use avpriv_open()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '71bf6b41d974229a06921806c333ce98566a5d8a'
Michael Niedermayer [Thu, 8 Aug 2013 09:36:21 +0000 (11:36 +0200)]
Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

* commit '71bf6b41d974229a06921806c333ce98566a5d8a':
  libavdevice: use avpriv_open()

Conflicts:
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
Michael Niedermayer [Thu, 8 Aug 2013 09:28:23 +0000 (11:28 +0200)]
Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'

* commit 'fee9db1fdf921295233e94cbe2769f9cd722206d':
  libavcodec: use avpriv_open()

Conflicts:
libavcodec/libxvid_rc.c

The changed code does not exist in ffmpeg anymore, thus nothing is
changed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '880391ed2d2faf796ca3a16f63cec69767546a21'
Michael Niedermayer [Thu, 8 Aug 2013 09:18:17 +0000 (11:18 +0200)]
Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

* commit '880391ed2d2faf796ca3a16f63cec69767546a21':
  libavutil: use avpriv_open()

Conflicts:
libavutil/random_seed.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil: Don't use fcntl if the function does not exist
Derek Buitenhuis [Wed, 7 Aug 2013 23:44:37 +0000 (19:44 -0400)]
libavutil: Don't use fcntl if the function does not exist

Not all platforms have the function.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add assembly version of h264_find_start_code_candidate
Ben Avison [Mon, 5 Aug 2013 12:12:48 +0000 (13:12 +0100)]
arm: Add assembly version of h264_find_start_code_candidate

               Before          After
               Mean   StdDev   Mean   StdDev  Change
This function   508.8 23.4      185.4  9.0    +174.4%
Overall        3068.5 31.7     2752.1 29.4     +11.5%

In combination with the preceding patch:
                Before          After
                Mean   StdDev   Mean   StdDev  Change
Overall         2925.6 26.2     2752.1 29.4     +6.3%

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoh264dsp: Factorize code into a new function, h264_find_start_code_candidate
Ben Avison [Mon, 5 Aug 2013 12:12:47 +0000 (13:12 +0100)]
h264dsp: Factorize code into a new function, h264_find_start_code_candidate

This performs the start code search which was previously part of
h264_find_frame_end() - the most CPU intensive part of the function.

By itself, this results in a performance regression:
              Before          After
              Mean   StdDev   Mean   StdDev  Change
Overall time  2925.6 26.2     3068.5 31.7    -4.7%

but this can more than be made up for by platform-optimised
implementations of the function.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoh264_parser: Initialize the h264dsp context in the parser as well
Ben Avison [Mon, 5 Aug 2013 12:12:46 +0000 (13:12 +0100)]
h264_parser: Initialize the h264dsp context in the parser as well

Each AVStream struct for an H.264 elementary stream actually has two
copies of the H264DSPContext struct (and in fact all the other members
of H264Context as well):

((H264Context *) ((AVStream *)st)->codec->priv_data)->h264dsp
((H264Context *) ((AVStream *)st)->parser->priv_data)->h264dsp

but only the first of these was actually being initialised. This
prevented the addition of platform-specific implementations of
parser-related functions.

Signed-off-by: Martin Storsjö <martin@martin.st>