ffmpeg.git
6 years agoavcodec/mjpegdec: print a message when there was just a single field and no frame
Michael Niedermayer [Wed, 14 Aug 2013 16:51:13 +0000 (18:51 +0200)]
avcodec/mjpegdec: print a message when there was just a single field and no frame

Fixes ticket1915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoWavPack encoder
Paul B Mahol [Tue, 22 Jan 2013 20:05:44 +0000 (20:05 +0000)]
WavPack encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 14 Aug 2013 10:42:37 +0000 (12:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sdp: Add an option for sending RTCP packets to the source of the last packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6b58e11a8331690ec32e9869db89ae10c54614e9'
Michael Niedermayer [Wed, 14 Aug 2013 10:36:07 +0000 (12:36 +0200)]
Merge commit '6b58e11a8331690ec32e9869db89ae10c54614e9'

* commit '6b58e11a8331690ec32e9869db89ae10c54614e9':
  rtpproto: Add an option for writing return packets to the address of the last received packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'
Michael Niedermayer [Wed, 14 Aug 2013 10:30:35 +0000 (12:30 +0200)]
Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'

* commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
  rtpproto: Update the parameter documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95'
Michael Niedermayer [Wed, 14 Aug 2013 10:22:20 +0000 (12:22 +0200)]
Merge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95'

* commit '5268bd2900effa59b51e0fede61aacde5e2f0b95':
  segafilm: Error out on impossible packet size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3562684db716d11de0b0dcc52748e9cd90d68132'
Michael Niedermayer [Wed, 14 Aug 2013 10:11:40 +0000 (12:11 +0200)]
Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'

* commit '3562684db716d11de0b0dcc52748e9cd90d68132':
  ogg: Always alloc the private context in vorbis_header

Conflicts:
libavformat/oggparsevorbis.c

See: 18b46a494ef3592d69f4638dac1ebb613c0f548d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7'
Michael Niedermayer [Wed, 14 Aug 2013 09:55:45 +0000 (11:55 +0200)]
Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7'

* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
  rtjpeg: Use init_get_bits8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '62cc7a91080194d9ead162516f779f20931220d9'
Michael Niedermayer [Wed, 14 Aug 2013 09:51:28 +0000 (11:51 +0200)]
Merge commit '62cc7a91080194d9ead162516f779f20931220d9'

* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2df0776c2293efb0ac12c003843ce19332342e01'
Michael Niedermayer [Wed, 14 Aug 2013 09:41:58 +0000 (11:41 +0200)]
Merge commit '2df0776c2293efb0ac12c003843ce19332342e01'

* commit '2df0776c2293efb0ac12c003843ce19332342e01':
  nuv: Use av_fast_realloc

Conflicts:
libavcodec/nuv.c

This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'
Michael Niedermayer [Wed, 14 Aug 2013 08:44:55 +0000 (10:44 +0200)]
Merge commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6'

* commit 'feaaf5f7f0afac7223457f871af2ec9b99eb6cc6':
  nuv: Reset the frame on resize

Conflicts:
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '075dbc185521f193c98b896cd63be3ec2613df5d'
Michael Niedermayer [Wed, 14 Aug 2013 08:35:38 +0000 (10:35 +0200)]
Merge commit '075dbc185521f193c98b896cd63be3ec2613df5d'

* commit '075dbc185521f193c98b896cd63be3ec2613df5d':
  nuv: Pad the lzo outbuf

Conflicts:
libavcodec/nuv.c

See: 95e1dfee76c9ecdf70037b7e792897bc6e3d460b
See: 266f6eefc603dd3c34be7de94eec5c9c293b80f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosdp: Add an option for sending RTCP packets to the source of the last packets
Martin Storsjö [Tue, 13 Aug 2013 10:21:35 +0000 (13:21 +0300)]
sdp: Add an option for sending RTCP packets to the source of the last packets

An SDP description normally only contains the target IP address
and port for the packets. This means that we don't really have
any clue where to send the RTCP RR packets - previously they're
sent to the destination IP written in the SDP (at the same port),
which rarely is the actual peer. And if the source for the packets
is on a different port than the destination, it's never correct.

With a new option, we can choose to send the packets to the
address that the latest packet on each socket arrived from.
---
Some may even argue that this should be the default - perhaps,
but I'd rather keep it optional at first. Additionally, I'm not
sure if sending RTCP RR directly back to the source is
desireable for e.g. multicast.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpproto: Add an option for writing return packets to the address of the last receive...
Martin Storsjö [Tue, 13 Aug 2013 10:20:42 +0000 (13:20 +0300)]
rtpproto: Add an option for writing return packets to the address of the last received packets

If we've received packets on the same socket before, the return
packets are sent to that address. If we've only received packets
on the other socket, try to guess the source port for the other
one assuming the basic +1/-1 logic.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'
Michael Niedermayer [Wed, 14 Aug 2013 08:07:38 +0000 (10:07 +0200)]
Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: check that the input media type match the filter
Michael Niedermayer [Wed, 14 Aug 2013 00:11:30 +0000 (02:11 +0200)]
ffmpeg_filter: check that the input media type match the filter

Fixes Ticket2012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/gsmdec: reject unsupported msn audio modes
Piotr Bandurski [Tue, 13 Aug 2013 21:09:24 +0000 (23:09 +0200)]
avcodec/gsmdec: reject unsupported msn audio modes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: reformat scale filter doc
Timothy Gu [Fri, 2 Aug 2013 22:31:11 +0000 (15:31 -0700)]
doc/filters: reformat scale filter doc

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agotiff: frame multithreading support
Paul B Mahol [Fri, 9 Aug 2013 14:01:46 +0000 (14:01 +0000)]
tiff: frame multithreading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agortpproto: Update the parameter documentation
Martin Storsjö [Tue, 13 Aug 2013 09:19:57 +0000 (12:19 +0300)]
rtpproto: Update the parameter documentation

Move the sources documentation up below the marker for deprecated
otpions. Also mention the new block parameter, that was added
in 749722209.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/mpeg12dec: check slice size before trying to decode it
Michael Niedermayer [Tue, 13 Aug 2013 17:36:50 +0000 (19:36 +0200)]
avcodec/mpeg12dec: check slice size before trying to decode it

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUpdate my email address.
Thilo Borgmann [Tue, 13 Aug 2013 08:04:05 +0000 (10:04 +0200)]
Update my email address.

6 years agoriff: add msn audio comment
Compn [Tue, 13 Aug 2013 13:41:28 +0000 (09:41 -0400)]
riff: add msn audio comment

6 years agoavcodec: free priv_data in avcodec_copy_context()
Michael Niedermayer [Tue, 13 Aug 2013 12:32:42 +0000 (14:32 +0200)]
avcodec: free priv_data in avcodec_copy_context()

Fixes memleak
Fixes Ticket2216

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: allocate rc_eq, prevent freeing invalid pointer
Michael Niedermayer [Tue, 13 Aug 2013 13:17:58 +0000 (15:17 +0200)]
ffserver: allocate rc_eq, prevent freeing invalid pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: clarify documentation of avcodec_copy_context()
Michael Niedermayer [Tue, 13 Aug 2013 12:31:31 +0000 (14:31 +0200)]
avcodec: clarify documentation of avcodec_copy_context()

Following this is not strictly needed but safes some malloc+free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosegafilm: Error out on impossible packet size
Luca Barbato [Tue, 13 Aug 2013 05:40:38 +0000 (07:40 +0200)]
segafilm: Error out on impossible packet size

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agolavfi/ebur128: fix typo: s/negociation/negotiation
Paul B Mahol [Tue, 13 Aug 2013 12:42:01 +0000 (12:42 +0000)]
lavfi/ebur128: fix typo: s/negociation/negotiation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoogg: Always alloc the private context in vorbis_header
Luca Barbato [Tue, 13 Aug 2013 05:28:41 +0000 (07:28 +0200)]
ogg: Always alloc the private context in vorbis_header

It is possible to have an initial broken header and then valid packets.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agortjpeg: Use init_get_bits8
Luca Barbato [Tue, 13 Aug 2013 05:05:28 +0000 (07:05 +0200)]
rtjpeg: Use init_get_bits8

CC:libav-stable@libav.org

6 years agortjpeg: return meaningful error codes
Luca Barbato [Sun, 11 Aug 2013 18:32:40 +0000 (20:32 +0200)]
rtjpeg: return meaningful error codes

6 years agonuv: Use av_fast_realloc
Luca Barbato [Tue, 13 Aug 2013 05:01:40 +0000 (07:01 +0200)]
nuv: Use av_fast_realloc

The decompressed buffer can be used after codec_reinit, so it must be
preserved.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agonuv: Reset the frame on resize
Luca Barbato [Tue, 13 Aug 2013 04:01:48 +0000 (06:01 +0200)]
nuv: Reset the frame on resize

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agonuv: Pad the lzo outbuf
Luca Barbato [Mon, 12 Aug 2013 09:34:06 +0000 (11:34 +0200)]
nuv: Pad the lzo outbuf

And properly update the buf_size with the correct size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agonuv: Do not ignore lzo decompression failures
Luca Barbato [Sun, 11 Aug 2013 22:16:12 +0000 (00:16 +0200)]
nuv: Do not ignore lzo decompression failures

Update the fate reference since the last broken frame is not decoded
anymore.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoMAINTAINERS: add myself as maintainer for MIPS and Zeljko Lukac as maintainer for...
Nedeljko Babic [Tue, 13 Aug 2013 09:43:58 +0000 (11:43 +0200)]
MAINTAINERS: add myself as maintainer for MIPS and Zeljko Lukac as maintainer for new fixed point FFT

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riff: treat msn audio like gsm_ms
Piotr Bandurski [Tue, 13 Aug 2013 09:10:39 +0000 (11:10 +0200)]
avformat/riff: treat msn audio like gsm_ms

Fixes decoding of 4 files from Ticket2854

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 13 Aug 2013 08:35:24 +0000 (10:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png: allow encoding 16-bit grayscale

Conflicts:
libavcodec/pngenc.c

See: fdc013da7863190b9416d45830a9ad6d7fb854c2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopng: allow encoding 16-bit grayscale
Ian Taylor [Tue, 13 Aug 2013 02:02:55 +0000 (22:02 -0400)]
png: allow encoding 16-bit grayscale

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoRemove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.
Alexis Ballier [Mon, 12 Aug 2013 23:17:55 +0000 (19:17 -0400)]
Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/version.h: Drop FF_API_OLD_AVIO (unused and undefined since libavformat 55)
Alexis Ballier [Mon, 12 Aug 2013 23:17:54 +0000 (19:17 -0400)]
libavformat/version.h: Drop FF_API_OLD_AVIO (unused and undefined since libavformat 55)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: Read EXIF metadata in JPEG input.
Thilo Borgmann [Mon, 12 Aug 2013 17:36:08 +0000 (19:36 +0200)]
avcodec/mjpegdec: Read EXIF metadata in JPEG input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: Add EXIF metadata parser to libavcodec.
Thilo Borgmann [Mon, 12 Aug 2013 17:35:11 +0000 (19:35 +0200)]
avcodec: Add EXIF metadata parser to libavcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/tiff: Refactor TIFF tag related functions to share the code.
Thilo Borgmann [Mon, 12 Aug 2013 17:32:40 +0000 (19:32 +0200)]
avcodec/tiff: Refactor TIFF tag related functions to share the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/asfdec: call ff_read_frame_flush() in asf_read_pts()
Michael Niedermayer [Mon, 12 Aug 2013 20:52:23 +0000 (22:52 +0200)]
avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()

flushing just the asf demuxer but not the cores buffers leads to inconsistencies
and a "random" packet position which later causes an assertion failure

Fixes Ticket2853

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavutil/opt.h: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavutil/opt.h: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavutil/file_open.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavutil/file_open.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/xsubenc.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/xsubenc.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/rv40.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/rv40.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/mpegvideo.h: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/mpegvideo.h: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/lpc.h: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/lpc.h: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/dv.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/dv.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/bintext.h: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/bintext.h: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/bink.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/bink.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/avcodec.h: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/avcodec.h: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/ac3tab.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/ac3tab.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/ac3enc_template.c: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
libavcodec/ac3enc_template.c: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters.texi: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
doc/filters.texi: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filter_design.txt: Fix duplicate words
Michael Niedermayer [Mon, 12 Aug 2013 17:40:29 +0000 (19:40 +0200)]
doc/filter_design.txt: Fix duplicate words

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopixfmt: extend description for planar YUV 9/10 bits formats
Kirill Gavrilov [Mon, 12 Aug 2013 15:29:35 +0000 (19:29 +0400)]
pixfmt: extend description for planar YUV 9/10 bits formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimg2dec: fix typo (double "with with")
Kirill Gavrilov [Mon, 12 Aug 2013 15:04:19 +0000 (19:04 +0400)]
img2dec: fix typo (double "with with")

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: do not pick evil path for trim filters
Paul B Mahol [Fri, 12 Jul 2013 21:40:58 +0000 (21:40 +0000)]
ffmpeg_filter: do not pick evil path for trim filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/trim: check for right default value
Paul B Mahol [Mon, 12 Aug 2013 10:56:52 +0000 (10:56 +0000)]
lavfi/trim: check for right default value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 12 Aug 2013 08:13:56 +0000 (10:13 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmall: use AVFrame API properly

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix wrong use of "an" in some comments.
Thilo Borgmann [Sun, 11 Aug 2013 19:21:53 +0000 (21:21 +0200)]
Fix wrong use of "an" in some comments.

6 years agoavcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data
Michael Niedermayer [Sun, 11 Aug 2013 22:13:21 +0000 (00:13 +0200)]
avcodec: Remove ff_packet_free_side_data, use av_packet_free_side_data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoape: check avio_read() return value
wm4 [Sun, 11 Aug 2013 15:40:33 +0000 (17:40 +0200)]
ape: check avio_read() return value

This sets pkt->size to absurd values on failure otherwise.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmall: use AVFrame API properly
Hendrik Leppkes [Thu, 8 Aug 2013 16:48:43 +0000 (18:48 +0200)]
wmall: use AVFrame API properly

This fixes a bug with non-refcounted callers resulting in invalid memory access.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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
6 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>
6 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>
6 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>