ffmpeg.git
8 years agoMerge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'
Michael Niedermayer [Mon, 29 Jul 2013 10:41:32 +0000 (12:41 +0200)]
Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'

* commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937':
  oma: check geob tag boundary

Conflicts:
libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'
Michael Niedermayer [Mon, 29 Jul 2013 10:21:08 +0000 (12:21 +0200)]
Merge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'

* commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a':
  oma: refactor seek function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'
Michael Niedermayer [Mon, 29 Jul 2013 10:07:11 +0000 (12:07 +0200)]
Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'

* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
  xl: Make sure the width is valid

Conflicts:
libavcodec/xl.c

See: 94b42da6963a88c9518039e0b8ca42b6aab8bfb3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '0f51c398beac87682b2249662b97e30512f7868c'
Michael Niedermayer [Mon, 29 Jul 2013 09:57:30 +0000 (11:57 +0200)]
Merge commit '0f51c398beac87682b2249662b97e30512f7868c'

* commit '0f51c398beac87682b2249662b97e30512f7868c':
  http: Support reading gzip/deflate compressed data
  utvideoenc: use av_image_copy_plane()

Conflicts:
libavformat/http.c
See: b09d86c6366f2933d7bec430486d9d56bf98f7b6
See: 6bab3430a775183f2f9acbd91d1376c71e87c026
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'
Michael Niedermayer [Mon, 29 Jul 2013 09:42:47 +0000 (11:42 +0200)]
Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'

* commit '62b1e3b1031e901105d78e831120de8e4c3e0013':
  aasc: Check minimum buffer size

Conflicts:
libavcodec/aasc.c

See: e1631f8ebe9a8f2a9cca85d60160b9be94eb63f3
See: 8a57ca5c6a1c0ad28afa7ea6f824981e6761cce1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
Michael Niedermayer [Mon, 29 Jul 2013 09:34:07 +0000 (11:34 +0200)]
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'

* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

Conflicts:
libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'
Michael Niedermayer [Mon, 29 Jul 2013 09:20:57 +0000 (11:20 +0200)]
Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'

* commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d':
  xl: Fix the buffer size check

Conflicts:
libavcodec/xl.c

See: 8c59e0c362b948a746392b65932dd1cfeab8076c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'
Michael Niedermayer [Mon, 29 Jul 2013 09:08:02 +0000 (11:08 +0200)]
Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotargaenc: remove unused TargaContext
Paul B Mahol [Fri, 26 Jul 2013 21:35:48 +0000 (21:35 +0000)]
targaenc: remove unused TargaContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agotruemotion2: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 14:49:12 +0000 (14:49 +0000)]
truemotion2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopnm: do not set avctx->coded_frame
Paul B Mahol [Sun, 28 Jul 2013 21:16:07 +0000 (21:16 +0000)]
pnm: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopnm: fix 255 < maxval < 65535 for pam with depth 1
Paul B Mahol [Sun, 28 Jul 2013 21:18:51 +0000 (21:18 +0000)]
pnm: fix 255 < maxval < 65535 for pam with depth 1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoRevert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."
Carl Eugen Hoyos [Sun, 28 Jul 2013 22:05:43 +0000 (00:05 +0200)]
Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."

The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.

This reverts commit 7651c0e49b1f6e66120ef32570a87e3f09224574.

8 years agoRevert "pnm: remove nonsense code"
Paul B Mahol [Sun, 28 Jul 2013 21:42:47 +0000 (21:42 +0000)]
Revert "pnm: remove nonsense code"

Breaks decoding pgms with 256 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.
This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933.

8 years agooma: check geob tag boundary
Luca Barbato [Wed, 17 Apr 2013 19:07:09 +0000 (21:07 +0200)]
oma: check geob tag boundary

Prevent read after buffer boundary on corrupted tag.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agooma: refactor seek function
Luca Barbato [Sat, 4 May 2013 05:40:09 +0000 (07:40 +0200)]
oma: refactor seek function

Properly propagate seek errors from avio and the generic pcm seek.

8 years agooggenc: Write stream metadata if available
James Almer [Thu, 18 Jul 2013 07:18:24 +0000 (04:18 -0300)]
oggenc: Write stream metadata if available

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoxl: Make sure the width is valid
Luca Barbato [Sun, 28 Jul 2013 16:24:15 +0000 (18:24 +0200)]
xl: Make sure the width is valid

And undo the wrong commit f1cb490d6d7391ff7e28cc376908cc98a652228d

CC: libav-stable@libav.org
8 years agoAvoid overflows when reading pgm files with maxval != 255 and != 65535.
Carl Eugen Hoyos [Sun, 28 Jul 2013 17:07:06 +0000 (19:07 +0200)]
Avoid overflows when reading pgm files with maxval != 255 and != 65535.

libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.

8 years agoAssume gray8 if 1 < maxval <= 255 in pgm.
Carl Eugen Hoyos [Sun, 28 Jul 2013 16:12:23 +0000 (18:12 +0200)]
Assume gray8 if 1 < maxval <= 255 in pgm.

8 years agohttp: Support reading gzip/deflate compressed data
Zhang Rui [Mon, 22 Jul 2013 20:07:10 +0000 (04:07 +0800)]
http: Support reading gzip/deflate compressed data

Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

Normally, http servers shouldn't send this to us since we
don't advertise it with an Accept-Encoding header, but some
servers still do it anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoSet bits_per_raw_sample when decoding mjpeg / ljpeg.
Carl Eugen Hoyos [Sun, 28 Jul 2013 15:02:22 +0000 (17:02 +0200)]
Set bits_per_raw_sample when decoding mjpeg / ljpeg.

The ljpeg decoder also supports gray images with
8 - 15 bits per component.

8 years agolavf/movenc: improve psp check
Matthieu Bouron [Sun, 28 Jul 2013 14:46:05 +0000 (16:46 +0200)]
lavf/movenc: improve psp check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/movenc: remove useless checks on AVOutputFormat
Matthieu Bouron [Sun, 28 Jul 2013 14:46:04 +0000 (16:46 +0200)]
lavf/movenc: remove useless checks on AVOutputFormat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoutvideoenc: use av_image_copy_plane()
Paul B Mahol [Sat, 27 Jul 2013 13:51:36 +0000 (13:51 +0000)]
utvideoenc: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agoffprobe: add -show_programs option
Florent Tribouilloy [Thu, 25 Jul 2013 10:55:40 +0000 (12:55 +0200)]
ffprobe: add -show_programs option

The option is used to sort the streams by program.

Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
8 years agoffprobe: do not treat array elements as nested in the compact writer
Stefano Sabatini [Sat, 27 Jul 2013 12:09:05 +0000 (14:09 +0200)]
ffprobe: do not treat array elements as nested in the compact writer

This fixes rendering of sections containing nested elements followed by
an array, for example as in the case:
programs->streams->stream

enabled by the -show_programs option.

8 years agodoc/ffprobe.xsd: specify tag elements in stream after disposition element
Stefano Sabatini [Sun, 28 Jul 2013 13:54:35 +0000 (15:54 +0200)]
doc/ffprobe.xsd: specify tag elements in stream after disposition element

Fix XML schema validation, since elements must appear in the same order
as specified in the schema.

8 years agoaasc: Check minimum buffer size
Luca Barbato [Sun, 7 Jul 2013 10:31:19 +0000 (12:31 +0200)]
aasc: Check minimum buffer size

Prevent some overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoqdm2: Whitespace cosmetics
Luca Barbato [Tue, 9 Jul 2013 11:32:42 +0000 (13:32 +0200)]
qdm2: Whitespace cosmetics

8 years agoflac: use meaningful return values
Luca Barbato [Wed, 10 Jul 2013 14:34:14 +0000 (16:34 +0200)]
flac: use meaningful return values

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 28 Jul 2013 12:07:34 +0000 (14:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: cosmetics: Consistently format list and table items

Conflicts:
doc/developer.texi
doc/fate.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
Michael Niedermayer [Sun, 28 Jul 2013 11:44:34 +0000 (13:44 +0200)]
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'
Michael Niedermayer [Sun, 28 Jul 2013 11:36:46 +0000 (13:36 +0200)]
Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'

* commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df':
  eval: Explicitly ignore return value of strtod() in parse_db()

Conflicts:
libavutil/eval.c

See: 3cd9849d9c24b0808e6e55cd7568250acaae2b91
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'
Michael Niedermayer [Sun, 28 Jul 2013 11:23:33 +0000 (13:23 +0200)]
Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'

* commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d':
  Remove unreachable returns

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'
Michael Niedermayer [Sun, 28 Jul 2013 11:13:47 +0000 (13:13 +0200)]
Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'

* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848':
  avidec: Let the inner dv demuxer take care of discarding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'
Michael Niedermayer [Sun, 28 Jul 2013 11:05:35 +0000 (13:05 +0200)]
Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoxl: Fix the buffer size check
Luca Barbato [Sat, 27 Jul 2013 18:34:07 +0000 (20:34 +0200)]
xl: Fix the buffer size check

Also make it the first check.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoxl: K&R formatting cosmetics
Luca Barbato [Sat, 27 Jul 2013 18:01:03 +0000 (20:01 +0200)]
xl: K&R formatting cosmetics

8 years agoMerge commit '37063714c0a064808f9671ec4d376955d664f463'
Michael Niedermayer [Sun, 28 Jul 2013 09:54:23 +0000 (11:54 +0200)]
Merge commit '37063714c0a064808f9671ec4d376955d664f463'

* commit '37063714c0a064808f9671ec4d376955d664f463':
  build: Only check FATE dependencies when running FATE tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
Michael Niedermayer [Sun, 28 Jul 2013 09:40:49 +0000 (11:40 +0200)]
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '966689442ed843019dc0722a49bfb0ac51755d19'
Michael Niedermayer [Sun, 28 Jul 2013 09:26:57 +0000 (11:26 +0200)]
Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: do not override format if neither text nor bitmap codec prop is set
Marton Balint [Sat, 27 Jul 2013 19:14:44 +0000 (21:14 +0200)]
lavc: do not override format if neither text nor bitmap codec prop is set

Some decoders may output both, this way the decoder can set it.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodpx: use av_image_copy_plane()
Paul B Mahol [Sat, 27 Jul 2013 20:51:14 +0000 (20:51 +0000)]
dpx: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agodpxenc: cosmetics: reindent
Paul B Mahol [Sat, 27 Jul 2013 20:45:48 +0000 (20:45 +0000)]
dpxenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agotarga_y216dec: remove empty function
Paul B Mahol [Sat, 27 Jul 2013 20:27:15 +0000 (20:27 +0000)]
targa_y216dec: remove empty function

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agozmbv: return meaningful error code
Paul B Mahol [Sat, 27 Jul 2013 20:21:33 +0000 (20:21 +0000)]
zmbv: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoutvideoenc: use av_image_copy_plane()
Paul B Mahol [Sat, 27 Jul 2013 13:51:36 +0000 (13:51 +0000)]
utvideoenc: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoForward interlaced field information from mov to v210 decoder.
Tim.Nicholson [Sat, 27 Jul 2013 16:57:28 +0000 (18:57 +0200)]
Forward interlaced field information from mov to v210 decoder.

Reported and tested by Dave Rice.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
8 years agodoc/codecs: fix dangling reference to codec-options chapter
Stefano Sabatini [Sat, 27 Jul 2013 14:50:19 +0000 (16:50 +0200)]
doc/codecs: fix dangling reference to codec-options chapter

8 years agodoc: cosmetics: Consistently format list and table items
Diego Biurrun [Tue, 26 Mar 2013 00:09:00 +0000 (01:09 +0100)]
doc: cosmetics: Consistently format list and table items

8 years agoAdd missing deprecation attributes
Diego Biurrun [Thu, 28 Feb 2013 18:24:29 +0000 (19:24 +0100)]
Add missing deprecation attributes

8 years agoeval: Explicitly ignore return value of strtod() in parse_db()
Diego Biurrun [Sat, 27 Jul 2013 11:14:15 +0000 (13:14 +0200)]
eval: Explicitly ignore return value of strtod() in parse_db()

The return value is not needed.  This fixes the warning:
libavutil/eval.c:353:15: warning: ignoring return value of ‘strtod’

8 years agoRemove unreachable returns
Diego Biurrun [Thu, 14 Feb 2013 11:42:57 +0000 (12:42 +0100)]
Remove unreachable returns

8 years agoavidec: Let the inner dv demuxer take care of discarding
Luca Barbato [Sat, 27 Jul 2013 13:48:41 +0000 (15:48 +0200)]
avidec: Let the inner dv demuxer take care of discarding

CC: libav-stable@libav.org
8 years agoavidec: K&R formatting cosmetics
Luca Barbato [Sat, 27 Jul 2013 10:47:09 +0000 (12:47 +0200)]
avidec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agobuild: Only check FATE dependencies when running FATE tests
Diego Biurrun [Thu, 18 Jul 2013 16:12:27 +0000 (18:12 +0200)]
build: Only check FATE dependencies when running FATE tests

Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoavcodec/vorbisenc: change 6 asserts to av_asserts()
Michael Niedermayer [Sat, 27 Jul 2013 13:05:06 +0000 (15:05 +0200)]
avcodec/vorbisenc: change 6 asserts to av_asserts()

speed relevant ones use av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavcodec/mpegvideo: update disabled assert() to av_assert0()
Michael Niedermayer [Sat, 27 Jul 2013 12:25:25 +0000 (14:25 +0200)]
avcodec/mpegvideo: update disabled assert() to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoexr: set pict_type
Paul B Mahol [Sat, 27 Jul 2013 11:30:55 +0000 (11:30 +0000)]
exr: set pict_type

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agotarga: set pict_type
Paul B Mahol [Sat, 27 Jul 2013 11:25:54 +0000 (11:25 +0000)]
targa: set pict_type

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoescape130: make "chroma_vals" static
Paul B Mahol [Fri, 26 Jul 2013 22:17:41 +0000 (22:17 +0000)]
escape130: make "chroma_vals" static

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
Paul B Mahol [Fri, 26 Jul 2013 21:50:28 +0000 (21:50 +0000)]
lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata

Also check return value.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolclenc: cosmetics: reindent
Paul B Mahol [Fri, 26 Jul 2013 21:42:08 +0000 (21:42 +0000)]
lclenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosgidec: safer check for buffer overflow
Paul B Mahol [Fri, 26 Jul 2013 21:53:54 +0000 (21:53 +0000)]
sgidec: safer check for buffer overflow

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosgidec: return meaningful error codes
Paul B Mahol [Fri, 26 Jul 2013 21:26:56 +0000 (21:26 +0000)]
sgidec: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosgidec: simplify return path
Paul B Mahol [Fri, 26 Jul 2013 21:09:06 +0000 (21:09 +0000)]
sgidec: simplify return path

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoh264: K&R formatting cosmetics
Diego Biurrun [Fri, 26 Jul 2013 19:03:55 +0000 (21:03 +0200)]
h264: K&R formatting cosmetics

8 years agobuffersink: K&R formatting cosmetics
Diego Biurrun [Fri, 26 Jul 2013 19:09:36 +0000 (21:09 +0200)]
buffersink: K&R formatting cosmetics

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 27 Jul 2013 07:43:29 +0000 (09:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
Michael Niedermayer [Sat, 27 Jul 2013 07:19:58 +0000 (09:19 +0200)]
Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'

* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

Conflicts:
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a'
Michael Niedermayer [Sat, 27 Jul 2013 07:12:56 +0000 (09:12 +0200)]
Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a'

* commit '80ade7985cd95156e2156f50adc7b86d0e43a07a':
  AIX: add support for shared builds

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'
Michael Niedermayer [Sat, 27 Jul 2013 07:05:26 +0000 (09:05 +0200)]
Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'

* commit 'b512360184ade835fba621f5042d643fc9e2ee9d':
  avio: Don't set the seekable flag if no seek function is provided

See: 650355089cc4b38a57c88203c81f4896a98a5a7e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'
Michael Niedermayer [Sat, 27 Jul 2013 06:58:20 +0000 (08:58 +0200)]
Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'

* commit '1297f7b87f8a84930a23eca705765c7c353dfcd5':
  rtpenc: Fix some odd comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'
Michael Niedermayer [Sat, 27 Jul 2013 06:52:30 +0000 (08:52 +0200)]
Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'

* commit '779e6c2b985f2ad461a1ae704160822f97709ba7':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
libavfilter/buffersink.c

See: af2a196e669cf7f00735a1df5889db35f3be87eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavfilter/vf_scale: set in_color_matrix default to "auto"
Michael Niedermayer [Fri, 26 Jul 2013 23:16:07 +0000 (01:16 +0200)]
avfilter/vf_scale: set in_color_matrix default to "auto"

8 years agoswscale/fill_rgb2yuv_table: fix default detection
Michael Niedermayer [Fri, 26 Jul 2013 23:11:37 +0000 (01:11 +0200)]
swscale/fill_rgb2yuv_table: fix default detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavfilter/vf_scale: use sws_getCoefficients()
Michael Niedermayer [Fri, 26 Jul 2013 21:03:58 +0000 (23:03 +0200)]
avfilter/vf_scale: use sws_getCoefficients()

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavcodec/mpegvideo: change some asserts to av_assert0()
Michael Niedermayer [Fri, 26 Jul 2013 19:46:47 +0000 (21:46 +0200)]
libavcodec/mpegvideo: change some asserts to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavcodec/mpegvideo: replace assert about interlaced EC by debug av_log()
Michael Niedermayer [Fri, 26 Jul 2013 18:44:53 +0000 (20:44 +0200)]
avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowtv: Drop some casts that now are unnecessary
Martin Storsjö [Fri, 26 Jul 2013 18:50:40 +0000 (21:50 +0300)]
wtv: Drop some casts that now are unnecessary

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agowtv: Make WTV_SECTOR_BITS a 64 bit constant
Martin Storsjö [Wed, 24 Jul 2013 09:21:49 +0000 (12:21 +0300)]
wtv: Make WTV_SECTOR_BITS a 64 bit constant

This makes sure that values that are left-shifted by this constant
end up casted to 64 bit before shifting, avoiding overflow if the
value ends up larger than 2 GB.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoAIX: add support for shared builds
Michael Kostylev [Thu, 25 Jul 2013 15:37:20 +0000 (11:37 -0400)]
AIX: add support for shared builds

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoavio: Don't set the seekable flag if no seek function is provided
Hendrik Schreiber [Tue, 23 Jul 2013 09:25:34 +0000 (11:25 +0200)]
avio: Don't set the seekable flag if no seek function is provided

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpenc: Fix some odd comments
Martin Storsjö [Fri, 26 Jul 2013 17:40:25 +0000 (20:40 +0300)]
rtpenc: Fix some odd comments

Some weird comments stem from the fact that the rtpdec and rtpenc
code was shared earlier.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoqcelpdec: change asserts to av_asserts
Paul B Mahol [Fri, 26 Jul 2013 18:32:27 +0000 (18:32 +0000)]
qcelpdec: change asserts to av_asserts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agosgienc: remove unused SgiContext
Paul B Mahol [Fri, 26 Jul 2013 18:21:44 +0000 (18:21 +0000)]
sgienc: remove unused SgiContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE
Paul B Mahol [Fri, 26 Jul 2013 17:16:26 +0000 (17:16 +0000)]
lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi: add attribute_align_arg to all public entry points
Hendrik Leppkes [Fri, 26 Jul 2013 08:20:47 +0000 (10:20 +0200)]
lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:24:55 +0000 (15:24 +0000)]
lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:20:13 +0000 (15:20 +0000)]
avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:11:17 +0000 (15:11 +0000)]
avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi/gradfun: remove nv21/nv12 as they are not supported
Paul B Mahol [Wed, 24 Jul 2013 17:09:14 +0000 (17:09 +0000)]
lavfi/gradfun: remove nv21/nv12 as they are not supported

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agopcxenc: get rid of unused PCXContext
Paul B Mahol [Fri, 26 Jul 2013 14:00:40 +0000 (14:00 +0000)]
pcxenc: get rid of unused PCXContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoyop: check return value of av_frame_alloc()
Paul B Mahol [Fri, 26 Jul 2013 13:51:26 +0000 (13:51 +0000)]
yop: check return value of av_frame_alloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agovmnc: check return values of reallocation
Paul B Mahol [Fri, 26 Jul 2013 13:49:36 +0000 (13:49 +0000)]
vmnc: check return values of reallocation

Also avoid memory leaks.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agovmnc: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 13:39:40 +0000 (13:39 +0000)]
vmnc: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agolavfi: add attribute_align_arg to all public entry points
Hendrik Leppkes [Fri, 26 Jul 2013 08:31:05 +0000 (10:31 +0200)]
lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi/buffersrc: remove unused item from BufferSourceContext
Paul B Mahol [Fri, 26 Jul 2013 11:43:43 +0000 (11:43 +0000)]
lavfi/buffersrc: remove unused item from BufferSourceContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years agoavformat/dtsdec: Improve probe, reject things looking like analoge signals
Michael Niedermayer [Fri, 26 Jul 2013 02:09:30 +0000 (04:09 +0200)]
avformat/dtsdec: Improve probe, reject things looking like analoge signals

Fixes Ticket2810

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