OSDN Git Service

android-x86/external-ffmpeg.git
9 years agolavd/libcdio: add more paranoia mode constants
Stefano Sabatini [Fri, 30 Jan 2015 17:30:17 +0000 (18:30 +0100)]
lavd/libcdio: add more paranoia mode constants

9 years agolavd/libcdio: apply minor fixes to options documentation
Stefano Sabatini [Fri, 30 Jan 2015 17:16:07 +0000 (18:16 +0100)]
lavd/libcdio: apply minor fixes to options documentation

9 years agoavformat/movenc: remove unneeded #include, there are no assert() only av_assert*
Paul B Mahol [Fri, 30 Jan 2015 11:26:25 +0000 (11:26 +0000)]
avformat/movenc: remove unneeded #include, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/mov: remove unneeded #include, there are no assert()
Paul B Mahol [Fri, 30 Jan 2015 11:25:18 +0000 (11:25 +0000)]
avformat/mov: remove unneeded #include, there are no assert()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/mux: remove unneeded #include, there are no assert() only av_assert*
Paul B Mahol [Fri, 30 Jan 2015 11:23:27 +0000 (11:23 +0000)]
avformat/mux: remove unneeded #include, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/asfenc: remove unneeded #include, there are no assert() only av_assert*
Paul B Mahol [Fri, 30 Jan 2015 11:21:10 +0000 (11:21 +0000)]
avformat/asfenc: remove unneeded #include, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/mpeg: remove unneeded #include, there are no assert() only av_assert*
Paul B Mahol [Fri, 30 Jan 2015 11:19:39 +0000 (11:19 +0000)]
avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/utils: remove unneeded #include, there are no assert() only av_assert*
Paul B Mahol [Fri, 30 Jan 2015 11:17:50 +0000 (11:17 +0000)]
avformat/utils: remove unneeded #include, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*
Paul B Mahol [Fri, 30 Jan 2015 10:52:19 +0000 (10:52 +0000)]
avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavcodec/svq1dec: remove unneeded #include, there are no assert()
Paul B Mahol [Fri, 30 Jan 2015 10:51:10 +0000 (10:51 +0000)]
avcodec/svq1dec: remove unneeded #include, there are no assert()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavcodec/h261enc: fix dquant encoding
Michael Niedermayer [Sat, 31 Jan 2015 03:57:50 +0000 (04:57 +0100)]
avcodec/h261enc: fix dquant encoding

Fixes Ticket4111

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavcodec/h264: replace assert() by av_assert0()
Michael Niedermayer [Sat, 31 Jan 2015 01:37:19 +0000 (02:37 +0100)]
libavcodec/h264: replace assert() by av_assert0()

also remove the now unneeded #include <assert.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ratecontrol: replace asserts by av_asserts
Michael Niedermayer [Sat, 31 Jan 2015 00:48:21 +0000 (01:48 +0100)]
avcodec/ratecontrol: replace asserts by av_asserts

Also remove the now unneeded #include <assert.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/vp3: use init_get_bits8()
Paul B Mahol [Fri, 30 Jan 2015 15:00:13 +0000 (15:00 +0000)]
avcodec/vp3: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 30 Jan 2015 18:01:53 +0000 (19:01 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Respect horizontal differencing predictor for 16bit gray tiff images.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavfi: remove mp=softpulldown
Paul B Mahol [Thu, 29 Jan 2015 13:45:55 +0000 (13:45 +0000)]
lavfi: remove mp=softpulldown

It is supposed to work correctly with MEncoder only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()
Michael Niedermayer [Fri, 30 Jan 2015 14:43:08 +0000 (15:43 +0100)]
avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoppc/mpegvideo_altivec: Change assert to av_assert2()
Michael Niedermayer [Fri, 30 Jan 2015 14:40:48 +0000 (15:40 +0100)]
ppc/mpegvideo_altivec: Change assert to av_assert2()

And move it to where the variable is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/videodsp_template: remove unneeded #include, there are no assert() only av_as...
Paul B Mahol [Fri, 30 Jan 2015 10:58:19 +0000 (10:58 +0000)]
avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert*

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavcodec/qdm2: remove unneeded #include, there are no assert()
Paul B Mahol [Fri, 30 Jan 2015 10:42:44 +0000 (10:42 +0000)]
avcodec/qdm2: remove unneeded #include, there are no assert()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoffmpeg: remove unused header
Paul B Mahol [Fri, 30 Jan 2015 14:03:51 +0000 (14:03 +0000)]
ffmpeg: remove unused header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/rtpdec_qdm2: change assert to av_assert0()
Paul B Mahol [Fri, 30 Jan 2015 11:44:00 +0000 (11:44 +0000)]
avformat/rtpdec_qdm2: change assert to av_assert0()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoffmpeg: free_input_threads requires HAVE_PTHREADS
Christophe Gisquet [Fri, 30 Jan 2015 13:09:02 +0000 (13:09 +0000)]
ffmpeg: free_input_threads requires HAVE_PTHREADS

Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRespect horizontal differencing predictor for 16bit gray tiff images.
Carl Eugen Hoyos [Fri, 30 Jan 2015 13:12:55 +0000 (14:12 +0100)]
Respect horizontal differencing predictor for 16bit gray tiff images.

Fixes ticket #4291.

9 years agodoc/muxers/segment: document strftime option
Stefano Sabatini [Fri, 30 Jan 2015 10:48:44 +0000 (11:48 +0100)]
doc/muxers/segment: document strftime option

It was added in commit 202947a0665ea523022afb0a6c50eed96bcd6b69.

9 years agoavformat/nut: support WavPack
Paul B Mahol [Tue, 27 Jan 2015 18:09:32 +0000 (18:09 +0000)]
avformat/nut: support WavPack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavformat/nut: add GIF[0]
Paul B Mahol [Thu, 29 Jan 2015 17:09:52 +0000 (17:09 +0000)]
avformat/nut: add GIF[0]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavcodec/aacdec: remove unneeded #include, theres no assert() in aacdec
Michael Niedermayer [Fri, 30 Jan 2015 01:29:38 +0000 (02:29 +0100)]
avcodec/aacdec: remove unneeded #include, theres no assert() in aacdec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/wma: remove unneeded #includes, there are no assert() only av_assert*
Michael Niedermayer [Fri, 30 Jan 2015 01:26:17 +0000 (02:26 +0100)]
avcodec/wma: remove unneeded #includes, there are no assert() only av_assert*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/hevc: Check for av_malloc failure
Michael Niedermayer [Thu, 29 Jan 2015 23:42:48 +0000 (00:42 +0100)]
avcodec/hevc: Check for av_malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/hevc: Replace more mallocs by av_malloc_array()
Michael Niedermayer [Thu, 29 Jan 2015 23:42:03 +0000 (00:42 +0100)]
avcodec/hevc: Replace more mallocs by av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ccaption_dec: Adding color and fonts for future use in screen
Anshul Maheshwari [Tue, 20 Jan 2015 10:32:29 +0000 (16:02 +0530)]
avcodec/ccaption_dec: Adding color and fonts for future use in screen

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/indevs: add some XCB info to x11grab
Lou Logan [Wed, 28 Jan 2015 18:35:31 +0000 (09:35 -0900)]
doc/indevs: add some XCB info to x11grab

Signed-off-by: Lou Logan <lou@lrcd.com>
9 years agoMerge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'
Michael Niedermayer [Thu, 29 Jan 2015 21:43:36 +0000 (22:43 +0100)]
Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'

* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f':
  hqdn3d: check memory allocations and propagate errors

Conflicts:
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'
Michael Niedermayer [Thu, 29 Jan 2015 21:34:54 +0000 (22:34 +0100)]
Merge commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1'

* commit '70d246d5cc3d214da11f711d997d8cbd8c3a23d1':
  flacenc: initialize sums matrix

Conflicts:
libavcodec/flacenc.c

No change, the table does not exist in FFmpeg in this form anymore

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'
Michael Niedermayer [Thu, 29 Jan 2015 21:02:03 +0000 (22:02 +0100)]
Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'

* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
  ituh263dec: use macro instead of #if

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'
Michael Niedermayer [Thu, 29 Jan 2015 20:55:02 +0000 (21:55 +0100)]
Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'

* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
  yuv4mpegdec: initialize field_order in yuv4_read_header()

Conflicts:
libavformat/yuv4mpegdec.c

See: 52a17972defa118705a4020a6d0bb3ad277df819
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'
Michael Niedermayer [Thu, 29 Jan 2015 20:35:21 +0000 (21:35 +0100)]
Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'

* commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a':
  mpegvideo_enc: initialize the encoding context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '1a07df31128da3a0020b66502399989b91770d44'
Michael Niedermayer [Thu, 29 Jan 2015 20:11:27 +0000 (21:11 +0100)]
Merge commit '1a07df31128da3a0020b66502399989b91770d44'

* commit '1a07df31128da3a0020b66502399989b91770d44':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

Conflicts:
Changelog
libavcodec/dnxhddata.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'
Michael Niedermayer [Thu, 29 Jan 2015 19:54:25 +0000 (20:54 +0100)]
Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'

* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
  DNxHD: Simplify pixel format detection

Conflicts:
libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'
Michael Niedermayer [Thu, 29 Jan 2015 19:38:35 +0000 (20:38 +0100)]
Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'

* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
  DNxHD: More verbose error messages

Conflicts:
libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '1279221cc4d63bc4449df86ae7a98e633f8be425'
Michael Niedermayer [Thu, 29 Jan 2015 19:28:24 +0000 (20:28 +0100)]
Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425'

* commit '1279221cc4d63bc4449df86ae7a98e633f8be425':
  lavu: Check av_dict_set allocations

Conflicts:
libavutil/dict.c

See: a963fdb0ea3fa6772ff8464838cd217a6369abfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohqdn3d: check memory allocations and propagate errors
Vittorio Giovara [Thu, 29 Jan 2015 15:55:19 +0000 (15:55 +0000)]
hqdn3d: check memory allocations and propagate errors

9 years agoflacenc: initialize sums matrix
Vittorio Giovara [Wed, 28 Jan 2015 14:41:02 +0000 (14:41 +0000)]
flacenc: initialize sums matrix

CC: libav-stable@libav.org
Bug-Id: CID 703821

9 years agoituh263dec: use macro instead of #if
Vittorio Giovara [Wed, 28 Jan 2015 15:42:50 +0000 (15:42 +0000)]
ituh263dec: use macro instead of #if

9 years agoyuv4mpegdec: initialize field_order in yuv4_read_header()
Vittorio Giovara [Wed, 28 Jan 2015 14:41:00 +0000 (14:41 +0000)]
yuv4mpegdec: initialize field_order in yuv4_read_header()

CC: libav-stable@libav.org
Bug-Id: CID 1265721

9 years agompegvideo_enc: initialize the encoding context
Vittorio Giovara [Wed, 28 Jan 2015 14:41:01 +0000 (14:41 +0000)]
mpegvideo_enc: initialize the encoding context

This prevents several uninitialized variable uses that take
place towards the end of encoding.

CC: libav-stable@libav.org
Bug-Id: CID 700760

9 years agoDNxHD: Add support for id 1258 (DNx100 960x720@8)
Vittorio Giovara [Tue, 27 Jan 2015 20:56:20 +0000 (20:56 +0000)]
DNxHD: Add support for id 1258 (DNx100 960x720@8)

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agoDNxHD: Simplify pixel format detection
Vittorio Giovara [Tue, 27 Jan 2015 20:56:19 +0000 (20:56 +0000)]
DNxHD: Simplify pixel format detection

Error out in case of unknown values.

9 years agoDNxHD: More verbose error messages
Vittorio Giovara [Tue, 27 Jan 2015 20:56:18 +0000 (20:56 +0000)]
DNxHD: More verbose error messages

9 years agolavu: Check av_dict_set allocations
Luca Barbato [Tue, 16 Dec 2014 13:21:20 +0000 (14:21 +0100)]
lavu: Check av_dict_set allocations

Bug-Id: CID 1257772
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agoavformat/concatdec: avoid NULL dereference when failed to open file.
Zhang Rui [Thu, 29 Jan 2015 09:55:32 +0000 (17:55 +0800)]
avformat/concatdec: avoid NULL dereference when failed to open file.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'
Michael Niedermayer [Thu, 29 Jan 2015 13:13:16 +0000 (14:13 +0100)]
Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'

* commit '6996fd204a7f28b46a8c3c97bcf223998218c743':
  libopenh264: Log debug messages to a non-null context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoexamples/filtering: extend comments about setting the filter graph endpoints
Stefano Sabatini [Tue, 27 Jan 2015 12:22:48 +0000 (13:22 +0100)]
examples/filtering: extend comments about setting the filter graph endpoints

That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.

9 years agolavfi: document assumptions about the input and output labels of a filter graph descr...
Stefano Sabatini [Tue, 27 Jan 2015 12:21:56 +0000 (13:21 +0100)]
lavfi: document assumptions about the input and output labels of a filter graph description

9 years agodoc/filters: apply some updates to the Filtergraph syntax section
Stefano Sabatini [Tue, 27 Jan 2015 11:47:29 +0000 (12:47 +0100)]
doc/filters: apply some updates to the Filtergraph syntax section

9 years agolibopenh264: Log debug messages to a non-null context
Martin Storsjö [Wed, 28 Jan 2015 20:17:29 +0000 (22:17 +0200)]
libopenh264: Log debug messages to a non-null context

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoFix frame-alignment in PP7
Arwa Arif [Wed, 28 Jan 2015 14:05:06 +0000 (19:35 +0530)]
Fix frame-alignment in PP7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 29 Jan 2015 02:02:04 +0000 (03:02 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add an ARES atom to extradata when encoding avui.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavutil: Added twofish symmetric block cipher
Supraja Meedinti [Sun, 25 Jan 2015 18:39:20 +0000 (00:09 +0530)]
libavutil: Added twofish symmetric block cipher

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd an ARES atom to extradata when encoding avui.
Carl Eugen Hoyos [Thu, 29 Jan 2015 00:07:08 +0000 (01:07 +0100)]
Add an ARES atom to extradata when encoding avui.

Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de

9 years agoMerge commit '61928b68dc28e080b8c8191afe5541123c682bbd'
Michael Niedermayer [Wed, 28 Jan 2015 21:41:39 +0000 (22:41 +0100)]
Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'

* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
libavcodec/h264.c

See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/aviobuf: Allow seeking to the end of the buffer for read only buffers
Michael Niedermayer [Wed, 28 Jan 2015 19:55:42 +0000 (20:55 +0100)]
avformat/aviobuf: Allow seeking to the end of the buffer for read only buffers

This undoes the effect of 3c18a7b18807de81566381a1bcbe9f6103c0296b for reading

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
Michael Niedermayer [Wed, 28 Jan 2015 19:37:28 +0000 (20:37 +0100)]
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'

* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
  avio: Do not consider the end-of-buffer position valid

Conflicts:
libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'
Michael Niedermayer [Wed, 28 Jan 2015 19:29:12 +0000 (20:29 +0100)]
Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'

* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
  libdc1394: Add support for MONO8 (gray) video mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/nsvdec: remove case which is no longer possible
Paul B Mahol [Wed, 28 Jan 2015 09:34:31 +0000 (09:34 +0000)]
avformat/nsvdec: remove case which is no longer possible

Check of channels !=0 is right above.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/x86/vf_fspp: Fix loop condition for column_fidct()
Michael Niedermayer [Wed, 28 Jan 2015 15:30:44 +0000 (16:30 +0100)]
avfilter/x86/vf_fspp: Fix loop condition for column_fidct()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_fspp: check count before calling row_idct()
Michael Niedermayer [Wed, 28 Jan 2015 15:26:00 +0000 (16:26 +0100)]
avfilter/vf_fspp: check count before calling row_idct()

Fixes crash with odd widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_fspp: Fix frame-alignment in FSPP
Arwa Arif [Wed, 28 Jan 2015 14:03:19 +0000 (19:33 +0530)]
avfilter/vf_fspp: Fix frame-alignment in FSPP

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: Do not share rbsp_buffer across threads
Michael Niedermayer [Sun, 25 Aug 2013 01:01:19 +0000 (03:01 +0200)]
h264: Do not share rbsp_buffer across threads

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
9 years agoavio: Do not consider the end-of-buffer position valid
Luca Barbato [Sat, 24 Jan 2015 12:06:19 +0000 (13:06 +0100)]
avio: Do not consider the end-of-buffer position valid

Trigger a refill if the seek action moves the pointer
at the end of the buffer.

Before this patch the read action following the seek would trigger
the refill, while write action would write outside the buffer.

In the Libav codebase few muxers seek forward outside of what
already has been written so it is quite unlikely to experience
the problem with the default buffer size.

CC: libav-stable@libav.org
9 years agolibdc1394: Add support for MONO8 (gray) video mode
Clay McClure [Sun, 4 Jan 2015 07:30:44 +0000 (00:30 -0700)]
libdc1394: Add support for MONO8 (gray) video mode

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoavfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:39:15 +0000 (14:39 +0000)]
avfilter/vf_colorchannelmixer: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/avf_avectorscope: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:34:11 +0000 (14:34 +0000)]
avfilter/avf_avectorscope: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/af_biquads: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:30:27 +0000 (14:30 +0000)]
avfilter/af_biquads: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/vf_extractplanes: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:26:13 +0000 (14:26 +0000)]
avfilter/vf_extractplanes: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfitler/vf_il: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:22:26 +0000 (14:22 +0000)]
avfitler/vf_il: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/vf_colorbalance: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 14:11:30 +0000 (14:11 +0000)]
avfilter/vf_colorbalance: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavfilter/vf_telecine: use the name 's' for the pointer to the private context
Paul B Mahol [Wed, 28 Jan 2015 13:51:18 +0000 (13:51 +0000)]
avfilter/vf_telecine: use the name 's' for the pointer to the private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoavutil/aes: Rename crypt()
Michael Niedermayer [Wed, 28 Jan 2015 12:12:02 +0000 (13:12 +0100)]
avutil/aes: Rename crypt()

This avoids a potential conflict with the equally named function from XOPEN
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h264_parser: Rename close()
Michael Niedermayer [Wed, 28 Jan 2015 12:09:30 +0000 (13:09 +0100)]
avcodec/h264_parser: Rename close()

This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/fftools-common-opts: update/extend documentation for -opencl_bench option
Maneesh Gupta [Tue, 27 Jan 2015 14:58:24 +0000 (20:28 +0530)]
doc/fftools-common-opts: update/extend documentation for -opencl_bench option

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
9 years agoavcodec/nvenc: Handle non-square pixel aspect ratios
Timo Rothenpieler [Mon, 26 Jan 2015 12:28:22 +0000 (13:28 +0100)]
avcodec/nvenc: Handle non-square pixel aspect ratios

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotests/fate: added mxf tests for essencegroups and missing index
Mark Reid [Mon, 26 Jan 2015 00:38:00 +0000 (16:38 -0800)]
tests/fate: added mxf tests for essencegroups and missing index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mxfdec: Fix cleanup in mxf_free_metadataset()
Carl Eugen Hoyos [Wed, 28 Jan 2015 01:59:03 +0000 (02:59 +0100)]
avformat/mxfdec: Fix cleanup in mxf_free_metadataset()

Fixes Ticket4256

Found-by: tholin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket
Michael Niedermayer [Tue, 27 Jan 2015 23:58:03 +0000 (00:58 +0100)]
avfilter/vf_mcdeint: avoid uninitilaized fields in AVPacket

This is also simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswresample_internal.h: Move struct declaration before first use.
Reimar Döffinger [Sun, 18 Jan 2015 22:29:13 +0000 (23:29 +0100)]
swresample_internal.h: Move struct declaration before first use.

It seems more logical and works with more restricted C compilers
like tinycc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoSupport BMP files that do not properly align lines.
Reimar Döffinger [Mon, 26 Jan 2015 19:19:17 +0000 (20:19 +0100)]
Support BMP files that do not properly align lines.

Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoMerge commit '8805589b803fab5f362008306319336ac79a3fa7'
Michael Niedermayer [Tue, 27 Jan 2015 19:31:46 +0000 (20:31 +0100)]
Merge commit '8805589b803fab5f362008306319336ac79a3fa7'

* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'
Michael Niedermayer [Tue, 27 Jan 2015 19:25:40 +0000 (20:25 +0100)]
Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'

* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
  dvbsubdec: check memory allocations and propagate errors

Conflicts:
libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'
Michael Niedermayer [Tue, 27 Jan 2015 19:09:49 +0000 (20:09 +0100)]
Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'

* commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52':
  nuv: validate image size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'
Michael Niedermayer [Tue, 27 Jan 2015 18:53:46 +0000 (19:53 +0100)]
Merge commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6'

* commit '7c51d79ca7badfb370c410b8f44c9142b938e2e6':
  nsvdec: validate channels and samplerate

See: d633e15d7d939f532326e2bc92097b12eba4d5ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'
Michael Niedermayer [Tue, 27 Jan 2015 17:49:50 +0000 (18:49 +0100)]
Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'

* commit 'a536a4e4bc52d05f59869761337452fb1f1977f6':
  lavc: support extracting audio service type from side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'
Michael Niedermayer [Tue, 27 Jan 2015 17:32:19 +0000 (18:32 +0100)]
Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'

* commit '32125781487411ed3b1b28b32063d6cd4024d4fc':
  mov: export audio service type as side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'
Michael Niedermayer [Tue, 27 Jan 2015 17:16:42 +0000 (18:16 +0100)]
Merge commit '4227e4fe7443733fb906f6fb6c265105e8269c74'

* commit '4227e4fe7443733fb906f6fb6c265105e8269c74':
  lavf: add a convenience function for adding side data to a stream

Conflicts:
libavformat/internal.h
libavformat/replaygain.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '728685f37ab333ca35980bd01766c78d197f784a'
Michael Niedermayer [Tue, 27 Jan 2015 17:02:42 +0000 (18:02 +0100)]
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'

* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'
Michael Niedermayer [Tue, 27 Jan 2015 16:29:05 +0000 (17:29 +0100)]
Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'

* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
  nutenc: do not use has_b_frames

Conflicts:
libavformat/nutenc.c
tests/ref/lavf/nut
tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
Michael Niedermayer [Tue, 27 Jan 2015 16:05:59 +0000 (17:05 +0100)]
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'

* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag
Michael Niedermayer [Tue, 27 Jan 2015 15:52:22 +0000 (16:52 +0100)]
avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag

If this causes problems then the stream_codec_tag should be enabled again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibopencv: Rework error handling in parse_iplconvkernel()
Vittorio Giovara [Fri, 23 Jan 2015 16:15:37 +0000 (16:15 +0000)]
libopencv: Rework error handling in parse_iplconvkernel()

Fix 'values' memory leak in case of error.

CC: libav-stable@libav.org
Bug-Id: CID 739879