ffmpeg.git
6 years agoMerge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'
Michael Niedermayer [Mon, 16 Sep 2013 12:06:28 +0000 (14:06 +0200)]
Merge commit '6fc8226e29055858f28973bb3d27b63b3b65e616'

* commit '6fc8226e29055858f28973bb3d27b63b3b65e616':
  vp3: Check the framerate for validity

Conflicts:
libavcodec/vp3.c

See: a56d963f111b1a192cdabb05500f8083bd77ca93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ac9d159015a88aa2721b271875d18482f713f354'
Michael Niedermayer [Mon, 16 Sep 2013 11:25:03 +0000 (13:25 +0200)]
Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'

* commit 'ac9d159015a88aa2721b271875d18482f713f354':
  proresdec: Properly make sure an index doesn't run past the limit

Conflicts:
libavcodec/proresdec_lgpl.c

See: 30df9789a9745d8e4b1afc10d1a983bfc8816eb9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef'
Michael Niedermayer [Mon, 16 Sep 2013 10:44:02 +0000 (12:44 +0200)]
Merge commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef'

* commit 'e90a6846c2c006fbebd00e1f2789f4a86fafacef':
  cavsdec: Make sure a sequence header has been decoded before decoding pictures

See: ec0965be36b55624a03d20c3b24e6a7aa61d6cd2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2'
Michael Niedermayer [Mon, 16 Sep 2013 10:37:35 +0000 (12:37 +0200)]
Merge commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2'

* commit '5bbfe193a0a41bd2adb648c8c3f6901a575734a2':
  vocdec: Don't update codec parameters mid-stream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'
Michael Niedermayer [Mon, 16 Sep 2013 10:32:24 +0000 (12:32 +0200)]
Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'

* commit '0ef1660a6365ce60ead8858936b6f3f8ea862826':
  sierravmd: Do sanity checking of frame sizes

Conflicts:
libavformat/sierravmd.c

See: 47c4713a23d271eedd2eb2c02daa70cb0ea4e0ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '342c43d154e586bc022c86b168fe8d36f69da9d3'
Michael Niedermayer [Mon, 16 Sep 2013 10:05:42 +0000 (12:05 +0200)]
Merge commit '342c43d154e586bc022c86b168fe8d36f69da9d3'

* commit '342c43d154e586bc022c86b168fe8d36f69da9d3':
  omadec: Properly check lengths before incrementing the position

See: f1d6f013b2078140fb701978d720abecde7cd73f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5'
Michael Niedermayer [Mon, 16 Sep 2013 09:59:50 +0000 (11:59 +0200)]
Merge commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5'

* commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5':
  mathops/x86: work around inline asm miscompilation with GCC 4.8.1

See: 659df32a9d8984081ccd54adc3aee7daeb33388d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3: Check the framerate for validity
Martin Storsjö [Thu, 12 Sep 2013 09:27:58 +0000 (12:27 +0300)]
vp3: Check the framerate for validity

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoproresdec: Properly make sure an index doesn't run past the limit
Martin Storsjö [Thu, 12 Sep 2013 09:10:18 +0000 (12:10 +0300)]
proresdec: Properly make sure an index doesn't run past the limit

If idx equaled num_coeffs - 1 on entry to the loop, the previous
check failed to break out of the loop.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocavsdec: Make sure a sequence header has been decoded before decoding pictures
Martin Storsjö [Thu, 12 Sep 2013 08:58:25 +0000 (11:58 +0300)]
cavsdec: Make sure a sequence header has been decoded before decoding pictures

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovocdec: Don't update codec parameters mid-stream
Martin Storsjö [Thu, 12 Sep 2013 08:31:53 +0000 (11:31 +0300)]
vocdec: Don't update codec parameters mid-stream

If we really want to support parameter changes, they need to be
signalled along with the AVPackets as parameter change side data,
not just changing the AVCodecContext parameters when a packet
is demuxed (since there may be other earlier packets yet undecoded).

Something similar was already done for the sample rate in 0883109b2,
but some parameters were left changeable.

This avoids having to recheck the channel count for validity for
each decoded frame in (ad)pcm decoders, unless the decoders
explicitly say that they accept parameter changes.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosierravmd: Do sanity checking of frame sizes
Martin Storsjö [Wed, 11 Sep 2013 19:56:55 +0000 (22:56 +0300)]
sierravmd: Do sanity checking of frame sizes

Limit the size to INT_MAX/2 (for simplicity) to be sure that
size + BYTES_PER_FRAME_RECORD won't overflow.

Also factorize other existing error return paths.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoomadec: Properly check lengths before incrementing the position
Martin Storsjö [Wed, 11 Sep 2013 11:54:05 +0000 (14:54 +0300)]
omadec: Properly check lengths before incrementing the position

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoriff: g723_1 decodes vivo g723.1 in asf
Compn [Mon, 16 Sep 2013 02:03:03 +0000 (22:03 -0400)]
riff: g723_1 decodes vivo g723.1 in asf
works on bellair_digital_movie.asf

6 years agoavcodec/mjpegdec: rgba64 ljpeg support
Michael Niedermayer [Mon, 16 Sep 2013 01:00:54 +0000 (03:00 +0200)]
avcodec/mjpegdec: rgba64 ljpeg support

Fixes Ticket2965

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: change error return value to be outside the 16bit range
Michael Niedermayer [Mon, 16 Sep 2013 00:59:33 +0000 (02:59 +0200)]
avcodec/mjpegdec: change error return value to be outside the 16bit range

Fixes part of Ticket2965

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/libmpcodecs: remove unused files
Paul B Mahol [Sun, 15 Sep 2013 21:28:13 +0000 (21:28 +0000)]
libavfilter/libmpcodecs: remove unused files

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/mjpegdec: Fix rgb48 ljpeg
Michael Niedermayer [Sun, 15 Sep 2013 21:13:52 +0000 (23:13 +0200)]
avcodec/mjpegdec: Fix rgb48 ljpeg

Fixes Ticket894

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/subtitles: Make comment less arrogant
Alexander Strasser [Mon, 9 Sep 2013 23:07:48 +0000 (01:07 +0200)]
lavf/subtitles: Make comment less arrogant

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoavcodec: typo fix sepera* → separa*
Clément Bœsch [Sun, 15 Sep 2013 19:32:42 +0000 (21:32 +0200)]
avcodec: typo fix sepera* → separa*

6 years agoavfilter/vf_gradfun: use av_calloc()
Paul B Mahol [Fri, 13 Sep 2013 09:31:54 +0000 (09:31 +0000)]
avfilter/vf_gradfun: use av_calloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vsrc_life: use av_calloc()
Paul B Mahol [Fri, 13 Sep 2013 09:25:32 +0000 (09:25 +0000)]
avfilter/vsrc_life: use av_calloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/c93: force dimensions to the correct value instead of depending on the demuxe...
Michael Niedermayer [Sun, 15 Sep 2013 18:04:24 +0000 (20:04 +0200)]
avcodec/c93: force dimensions to the correct value instead of depending on the demuxer to do so

Fixes Ticket2934

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomathops/x86: work around inline asm miscompilation with GCC 4.8.1
Hendrik Leppkes [Sat, 15 Jun 2013 20:46:01 +0000 (22:46 +0200)]
mathops/x86: work around inline asm miscompilation with GCC 4.8.1

The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavcodec/g2meet: Fix order of align and pixel size multiplication.
Michael Niedermayer [Sun, 15 Sep 2013 14:33:27 +0000 (16:33 +0200)]
avcodec/g2meet: Fix order of align and pixel size multiplication.

Fixes out of array accesses
Fixes Ticket2922

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: print invalid cdx/y values
Michael Niedermayer [Wed, 21 Aug 2013 02:43:57 +0000 (04:43 +0200)]
avcodec/jpeg2000dec: print invalid cdx/y values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: avoid testing float == 0
Michael Niedermayer [Thu, 9 May 2013 14:41:56 +0000 (16:41 +0200)]
avfilter: avoid testing float == 0

This fixes the hypothetical case of rounding errors causing
incorrect values to be used.
We do not use *_EPSILON, because non trivial expressions can contain
errors larger than that making a zero equality test with *_EPSILON
unreliable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_aecho & af_compand: use extended_data
Paul B Mahol [Sun, 15 Sep 2013 12:10:12 +0000 (12:10 +0000)]
avfilter/af_aecho & af_compand: use extended_data

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agochangelog: add ffv1 yuva and dts streamid change
Compn [Sun, 15 Sep 2013 11:24:16 +0000 (07:24 -0400)]
changelog: add ffv1 yuva and dts streamid change

6 years agoavfilter/avfilter: check allocation failure in ff_insert_pad()
Paul B Mahol [Fri, 13 Sep 2013 10:13:12 +0000 (10:13 +0000)]
avfilter/avfilter: check allocation failure in ff_insert_pad()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomatroskadec: Mute "Unknown entry" log messages for CueRelativePosition entries
James Almer [Sun, 15 Sep 2013 09:32:36 +0000 (06:32 -0300)]
matroskadec: Mute "Unknown entry" log messages for CueRelativePosition entries

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 15 Sep 2013 09:56:56 +0000 (11:56 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mem: Document the non-compatibility of av_realloc() and av_malloc()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: improve libvo-aacenc doc
Timothy Gu [Sun, 8 Sep 2013 03:13:11 +0000 (20:13 -0700)]
doc/encoders: improve libvo-aacenc doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/encoders: add doc for AAC encoder
Timothy Gu [Sun, 8 Sep 2013 23:32:22 +0000 (16:32 -0700)]
doc/encoders: add doc for AAC encoder

Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoavcodec/simple_idct_template: adjust coeffs for 12bit idct
Michael Niedermayer [Sun, 15 Sep 2013 01:21:03 +0000 (03:21 +0200)]
avcodec/simple_idct_template: adjust coeffs for 12bit idct

This prevents overflows with 12bit jpegs
Fixes Ticket2952

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: Bump DocTypeVersion to 4
James Almer [Sat, 14 Sep 2013 22:17:55 +0000 (19:17 -0300)]
matroskaenc: Bump DocTypeVersion to 4

The muxer has been creating files with v4 elements for some time now,
and especially now that we can mux non-experimental Opus files, reporting
the DocTypeVersion as 2 is not correct.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdding a line to Changelog about FFV1 version 1.3 now being stable
Dave Rice [Sat, 14 Sep 2013 19:36:16 +0000 (15:36 -0400)]
Adding a line to Changelog about FFV1 version 1.3 now being stable

FFV1 version 1.3 is non-experimental as of Aug 26, 2013. Adding that to the changelog.

Signed-Off By: dericed <dave@dericed.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nutenc: use av_reallocp_array()
Paul B Mahol [Sat, 14 Sep 2013 14:27:15 +0000 (14:27 +0000)]
avformat/nutenc: use av_reallocp_array()

Fixes memleak on allocation error.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/nutenc: use av_calloc()
Paul B Mahol [Sat, 14 Sep 2013 14:23:00 +0000 (14:23 +0000)]
avformat/nutenc: use av_calloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomem: Document the non-compatibility of av_realloc() and av_malloc()
Diego Biurrun [Fri, 13 Sep 2013 18:01:30 +0000 (20:01 +0200)]
mem: Document the non-compatibility of av_realloc() and av_malloc()

6 years agoavcodec/bfi: check for malloc failure
Piotr Bandurski [Sat, 14 Sep 2013 11:54:10 +0000 (13:54 +0200)]
avcodec/bfi: check for malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mationpixels: free memory after malloc failures
Piotr Bandurski [Sat, 14 Sep 2013 02:38:15 +0000 (04:38 +0200)]
avcodec/mationpixels: free memory after malloc failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/avf_avectorscope: improve description
Paul B Mahol [Sat, 14 Sep 2013 12:11:22 +0000 (12:11 +0000)]
avfilter/avf_avectorscope: improve description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/cdxl: use av_freep()
Paul B Mahol [Sat, 14 Sep 2013 10:45:14 +0000 (10:45 +0000)]
avcodec/cdxl: use av_freep()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/mationpixels: check for malloc failures
Piotr Bandurski [Sat, 14 Sep 2013 02:03:11 +0000 (04:03 +0200)]
avcodec/mationpixels: check for malloc failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: allow choosing the pixel format
Alexey Balekhov [Sat, 14 Sep 2013 01:51:45 +0000 (03:51 +0200)]
ffserver: allow choosing the pixel format

Fixes Ticket2954

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated
Michael Niedermayer [Fri, 13 Sep 2013 22:31:40 +0000 (00:31 +0200)]
avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocated

Fixes Ticket2950

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]
Michael Niedermayer [Fri, 13 Sep 2013 21:22:44 +0000 (23:22 +0200)]
avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[]

Fixes null pointer dereference
Fixes Ticket2947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/g2meet: remove redundant log message
Paul B Mahol [Fri, 13 Sep 2013 20:38:26 +0000 (20:38 +0000)]
avcodec/g2meet: remove redundant log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/proresdec2: remove duplicated tables
Paul B Mahol [Thu, 12 Sep 2013 18:11:44 +0000 (18:11 +0000)]
avcodec/proresdec2: remove duplicated tables

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/video: remove commented out cruft
Paul B Mahol [Fri, 13 Sep 2013 13:47:07 +0000 (13:47 +0000)]
avfilter/video: remove commented out cruft

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavutil/pixdesc: dont try to use av_read_image_line() with bayer formats
Michael Niedermayer [Fri, 13 Sep 2013 18:51:41 +0000 (20:51 +0200)]
avutil/pixdesc: dont try to use av_read_image_line() with bayer formats

It has undefined behavior ATM as its not supported.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/pixdesc: Prevent minor array overread in ff_check_pixfmt_descriptors()
Michael Niedermayer [Fri, 13 Sep 2013 18:51:04 +0000 (20:51 +0200)]
avutil/pixdesc: Prevent minor array overread in ff_check_pixfmt_descriptors()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 13 Sep 2013 11:48:36 +0000 (13:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-dvd: Minor leftovers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30'
Michael Niedermayer [Fri, 13 Sep 2013 11:41:38 +0000 (13:41 +0200)]
Merge commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30'

* commit 'd9cdb7d8d6d828bb5497ea3f0fd7edd2f3f6cc30':
  pcm-dvd: Support channel configuration changes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopcm-dvd: Minor leftovers
Christian Schmidt [Wed, 11 Sep 2013 14:17:13 +0000 (16:17 +0200)]
pcm-dvd: Minor leftovers

Drop a pointless branch in uninit and use the compact copyright.

6 years agopcm-dvd: Support channel configuration changes
Christian Schmidt [Wed, 11 Sep 2013 14:12:27 +0000 (16:12 +0200)]
pcm-dvd: Support channel configuration changes

The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.

Thanks to Michael Niedermeyer for pointing these out.

6 years agoavfilter/vf_noise: rename linesize to bytewidth
Michael Niedermayer [Fri, 13 Sep 2013 09:29:28 +0000 (11:29 +0200)]
avfilter/vf_noise: rename linesize to bytewidth

Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "avfilter/vf_noise: dont corrupt the picture outside width x height"
Michael Niedermayer [Fri, 13 Sep 2013 09:24:10 +0000 (11:24 +0200)]
Revert "avfilter/vf_noise: dont corrupt the picture outside width x height"

This reverts commit 51dab60c7b91a21ec280c7d3042aa8350aae048f.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707
6 years agoavfilter/vidstabtransform: allow negative zoom.
Georg Martius [Fri, 13 Sep 2013 09:31:56 +0000 (11:31 +0200)]
avfilter/vidstabtransform: allow negative zoom.

This is useful in addition to crop=black.

Signed-off-by: Clément Bœsch <clement@stupeflix.com>
6 years agolavf/matroska: Removing experimental suffix for Opus
Vignesh Venkatasubramanian [Thu, 12 Sep 2013 17:24:43 +0000 (10:24 -0700)]
lavf/matroska: Removing experimental suffix for Opus

Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this
as the implementation of embedding Opus in Matroska is complete.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdding a line to Changelog about Opus Matroska Support
Vignesh Venkatasubramanian [Thu, 12 Sep 2013 17:22:36 +0000 (10:22 -0700)]
Adding a line to Changelog about Opus Matroska Support

Next release of ffmpeg will support embedding Opus in Matroska
container. Adding that to the Changelog.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 12 Sep 2013 20:19:33 +0000 (22:19 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Set bits_per_raw_sample when reading j2k frames.
  libopenjpegdec.c: Correctly scale gray16 output if precision < 16
  Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
  Store the video bit_rate in the context when muxing mxf.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/smacker: use init_get_bits8()
Paul B Mahol [Thu, 12 Sep 2013 16:34:54 +0000 (16:34 +0000)]
avcodec/smacker: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/aacenc: use enum for aac coder.
Michael Niedermayer [Thu, 12 Sep 2013 15:25:30 +0000 (17:25 +0200)]
avcodec/aacenc: use enum for aac coder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacenc: use constants to set AAC coder
Timothy Gu [Wed, 11 Sep 2013 03:24:39 +0000 (20:24 -0700)]
aacenc: use constants to set AAC coder

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros
Timothy Gu [Wed, 11 Sep 2013 03:23:32 +0000 (20:23 -0700)]
aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false"
Michael Niedermayer [Thu, 12 Sep 2013 14:34:24 +0000 (16:34 +0200)]
avcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_noise: dont corrupt the picture outside width x height
Michael Niedermayer [Thu, 12 Sep 2013 14:33:21 +0000 (16:33 +0200)]
avfilter/vf_noise: dont corrupt the picture outside width x height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_noise: unbreak filter when inline assembly is not present
Paul B Mahol [Thu, 12 Sep 2013 14:54:10 +0000 (14:54 +0000)]
avfilter/vf_noise: unbreak filter when inline assembly is not present

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/smacker: fix some memleaks
Michael Niedermayer [Thu, 12 Sep 2013 13:44:32 +0000 (15:44 +0200)]
avcodec/smacker: fix some memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/smacker: remove check that has become redundant
Michael Niedermayer [Thu, 12 Sep 2013 13:41:59 +0000 (15:41 +0200)]
avcodec/smacker: remove check that has become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/smacker: use the correct field instead of a hardcoded value for the index...
Michael Niedermayer [Thu, 12 Sep 2013 13:31:12 +0000 (15:31 +0200)]
avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovformat/smacker: use av_freep() to ensure no stale pointers remain
Michael Niedermayer [Thu, 12 Sep 2013 13:27:17 +0000 (15:27 +0200)]
vformat/smacker: use av_freep() to ensure no stale pointers remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: various cosmetics
Paul B Mahol [Sat, 7 Sep 2013 12:13:50 +0000 (12:13 +0000)]
avfilter: various cosmetics

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

* qatar/master:
  matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Conflicts:
libavformat/matroskaenc.c

Mostly not merged as the buggy code was no longer part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: move sections from lavc to lavu
Stefano Sabatini [Thu, 12 Sep 2013 07:20:05 +0000 (09:20 +0200)]
MAINTAINERS: move sections from lavc to lavu

Reflect current code organization.

6 years agoMerge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'
Michael Niedermayer [Thu, 12 Sep 2013 13:02:23 +0000 (15:02 +0200)]
Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'

* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
  mp3: add .mpa extension

Conflicts:
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'
Michael Niedermayer [Thu, 12 Sep 2013 12:57:08 +0000 (14:57 +0200)]
Merge commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984'

* commit 'e2cd766ca1b9bb2ba72aca5f6ba5d8be15743984':
  configure: Mention that icl does not build both static and shared libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1e469885362febce3d9a4678624e44a92f77da9'
Michael Niedermayer [Thu, 12 Sep 2013 12:39:42 +0000 (14:39 +0200)]
Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9'

* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

See: 3c4c5ca1c194464f51de87534d15602f99bf9759
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
Michael Niedermayer [Thu, 12 Sep 2013 12:33:25 +0000 (14:33 +0200)]
Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'

* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
  aic: Validate values read from the bitstream

Conflicts:
libavcodec/aic.c

See: 657875b145c788d29b8e3bf38f79264e657932ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'
Michael Niedermayer [Thu, 12 Sep 2013 12:21:54 +0000 (14:21 +0200)]
Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'

* commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0':
  mpc8: Make sure the first stream exists before parsing the seek table

Conflicts:
libavformat/mpc8.c

See: 69fb605ad5e0f1384ca4d06d38ce0f1b6c8c286d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'
Michael Niedermayer [Thu, 12 Sep 2013 12:10:17 +0000 (14:10 +0200)]
Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'

* commit '459f2b393a3f89ed08d10fbceb4738d1429f268e':
  mpc8: Check the seek table size parsed from the bitstream

Conflicts:
libavformat/mpc8.c

See: b61ba262a1e275f8129b7383d70fe48051b47fcf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0d61f260010707f3028b818e8b24598e1a83d696'
Michael Niedermayer [Thu, 12 Sep 2013 11:58:01 +0000 (13:58 +0200)]
Merge commit '0d61f260010707f3028b818e8b24598e1a83d696'

* commit '0d61f260010707f3028b818e8b24598e1a83d696':
  zmbvdec: Check the buffer size for uncompressed data

Conflicts:
libavcodec/zmbv.c

See: 44c23aa1b85d195db6647d24e3b1d3de051790db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '183b9d843a9533774fabd3984a52f3987001acbc'
Michael Niedermayer [Thu, 12 Sep 2013 11:45:03 +0000 (13:45 +0200)]
Merge commit '183b9d843a9533774fabd3984a52f3987001acbc'

* commit '183b9d843a9533774fabd3984a52f3987001acbc':
  ape: Don't allow the seektable to be omitted

See: e7cb161515fc9fb6d30d1681d64d9ba7ad737a4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'
Michael Niedermayer [Thu, 12 Sep 2013 11:37:20 +0000 (13:37 +0200)]
Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc'

* commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc':
  shorten: Break out of loop looking for fmt chunk if none is found

See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'
Michael Niedermayer [Thu, 12 Sep 2013 11:30:44 +0000 (13:30 +0200)]
Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b'

* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
libavcodec/shorten.c

See: 5e9a56a0350c518cd4b38845aff49d41a9c952ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: Fix stray pointers left over from av_reallocp_array refactoring
Alexandra Khirnova [Thu, 12 Sep 2013 07:49:38 +0000 (09:49 +0200)]
matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agomp3: add .mpa extension
Vittorio Giovara [Mon, 9 Sep 2013 14:30:35 +0000 (16:30 +0200)]
mp3: add .mpa extension

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconfigure: Mention that icl does not build both static and shared libs
Diego Biurrun [Tue, 10 Sep 2013 10:28:19 +0000 (12:28 +0200)]
configure: Mention that icl does not build both static and shared libs

6 years agoMerge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
Michael Niedermayer [Thu, 12 Sep 2013 10:57:58 +0000 (12:57 +0200)]
Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'

* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
  smacker: Free memory properly if the init function fails

Conflicts:
libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'
Michael Niedermayer [Thu, 12 Sep 2013 10:45:29 +0000 (12:45 +0200)]
Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da'

* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
  smacker: Make sure we don't fill in huffman codes out of range

Conflicts:
libavcodec/smacker.c

See: 1285baaab550e3e761590ef6dfb1d9bd9d1332e4
the added test is redundant but will be used after future refactoring

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd002fce24a7206e95f9492031f45adc35711e183'
Michael Niedermayer [Thu, 12 Sep 2013 09:55:08 +0000 (11:55 +0200)]
Merge commit 'd002fce24a7206e95f9492031f45adc35711e183'

* commit 'd002fce24a7206e95f9492031f45adc35711e183':
  smacker: Check malloc return values

Conflicts:
libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '710b0e27025948b7511821c2f888ff2d74a59e14'
Michael Niedermayer [Thu, 12 Sep 2013 09:38:55 +0000 (11:38 +0200)]
Merge commit '710b0e27025948b7511821c2f888ff2d74a59e14'

* commit '710b0e27025948b7511821c2f888ff2d74a59e14':
  smacker: Avoid integer overflow when allocating packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8d928023f953a28692ba27071a448259134b103b'
Michael Niedermayer [Thu, 12 Sep 2013 09:26:11 +0000 (11:26 +0200)]
Merge commit '8d928023f953a28692ba27071a448259134b103b'

* commit '8d928023f953a28692ba27071a448259134b103b':
  smacker: Don't return packets in unallocated streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'
Michael Niedermayer [Thu, 12 Sep 2013 09:17:21 +0000 (11:17 +0200)]
Merge commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e'

* commit '48d6556dd46d4f4fac10d0f4a819e314887cd50e':
  dsicin: Add some basic sanity checks for fields read from the file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5045f6bdfabfa5d3374756d2c23f762fb042acae'
Michael Niedermayer [Thu, 12 Sep 2013 09:09:04 +0000 (11:09 +0200)]
Merge commit '5045f6bdfabfa5d3374756d2c23f762fb042acae'

* commit '5045f6bdfabfa5d3374756d2c23f762fb042acae':
  configure: Fix wrong reference to user support mailing list

Conflicts:
configure

No change as the reference was not wrong in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: Allocate cursor buffers large enough to fit the aligned width
Martin Storsjö [Wed, 11 Sep 2013 20:40:12 +0000 (23:40 +0300)]
g2meet: Allocate cursor buffers large enough to fit the aligned width

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaic: Validate values read from the bitstream
Martin Storsjö [Wed, 11 Sep 2013 20:25:04 +0000 (23:25 +0300)]
aic: Validate values read from the bitstream

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompc8: Make sure the first stream exists before parsing the seek table
Martin Storsjö [Wed, 11 Sep 2013 19:53:15 +0000 (22:53 +0300)]
mpc8: Make sure the first stream exists before parsing the seek table

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>