ffmpeg.git
6 years agodoc/muxers: itemize tee examples
Stefano Sabatini [Wed, 18 Sep 2013 22:46:53 +0000 (00:46 +0200)]
doc/muxers: itemize tee examples

Improve rendering.

6 years agomatroskaenc: Write muxingapp and writingapp elements when using bitexact flag
James Almer [Wed, 18 Sep 2013 03:59:34 +0000 (00:59 -0300)]
matroskaenc: Write muxingapp and writingapp elements when using bitexact flag

Files won't validate with mkvalidtor if these two elements are missing.
Use a const "Lavf" string that wont change with library version bumps.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Fix exif tests ffprobe dependency
James Almer [Wed, 18 Sep 2013 03:55:58 +0000 (00:55 -0300)]
fate: Fix exif tests ffprobe dependency

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: Fix two hashes
James Almer [Wed, 18 Sep 2013 04:06:15 +0000 (01:06 -0300)]
doc/APIchanges: Fix two hashes

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_telecine: remove redudant av_frame_copy_props()
Paul B Mahol [Wed, 18 Sep 2013 19:17:34 +0000 (19:17 +0000)]
avfilter/vf_telecine: remove redudant av_frame_copy_props()

It is already called by av_frame_clone().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_pullup: remove junk_down nonsense
Paul B Mahol [Wed, 18 Sep 2013 12:46:44 +0000 (12:46 +0000)]
avfilter/vf_pullup: remove junk_down nonsense

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_pullup: change log level to error
Paul B Mahol [Wed, 18 Sep 2013 11:55:04 +0000 (11:55 +0000)]
avfilter/vf_pullup: change log level to error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_pullup: fix memleak of metrics for last PullupField
Paul B Mahol [Wed, 18 Sep 2013 11:49:58 +0000 (11:49 +0000)]
avfilter/vf_pullup: fix memleak of metrics for last PullupField

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

* qatar/master:
  movenc: Add an option for omitting the tfhd base offset

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_pullup: make sure metric_plane is available
Paul B Mahol [Wed, 18 Sep 2013 11:27:41 +0000 (11:27 +0000)]
avfilter/vf_pullup: make sure metric_plane is available

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/mp: remove mp=pullup
Paul B Mahol [Wed, 18 Sep 2013 11:04:11 +0000 (11:04 +0000)]
lavfi/mp: remove mp=pullup

The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4'
Michael Niedermayer [Wed, 18 Sep 2013 10:47:47 +0000 (12:47 +0200)]
Merge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4'

* commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4':
  movenc: Write the moof atom in two passes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'
Michael Niedermayer [Wed, 18 Sep 2013 10:26:32 +0000 (12:26 +0200)]
Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'

* commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4':
  twinvqdec: Check the ibps parameter separately

See: b8dc5f8bb3b14bfd2289a0444c7b706299555d97
See: 98b377004d9c6fa1c1756c814efe9882b65f96b9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8583b14252deac71136f1dec231910abab0ba503'
Michael Niedermayer [Wed, 18 Sep 2013 10:08:37 +0000 (12:08 +0200)]
Merge commit '8583b14252deac71136f1dec231910abab0ba503'

* commit '8583b14252deac71136f1dec231910abab0ba503':
  rtmp: Support reading interleaved chunks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'
Michael Niedermayer [Wed, 18 Sep 2013 09:24:27 +0000 (11:24 +0200)]
Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'

* commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68':
  xmv: Add more sanity checks for parameters read from the bitstream

Conflicts:
libavformat/xmv.c

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

* commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6':
  rtmpproto: Extend a comment to explain the prev_pkt arrays roles

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '647d655d19c38e9716328e4787199149097d6089'
Michael Niedermayer [Wed, 18 Sep 2013 09:00:47 +0000 (11:00 +0200)]
Merge commit '647d655d19c38e9716328e4787199149097d6089'

* commit '647d655d19c38e9716328e4787199149097d6089':
  rtmpproto: Consistently use the right prev_pkt array

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0d3784396b736374a61fea26268febdabd803a59'
Michael Niedermayer [Wed, 18 Sep 2013 08:50:49 +0000 (10:50 +0200)]
Merge commit '0d3784396b736374a61fea26268febdabd803a59'

* commit '0d3784396b736374a61fea26268febdabd803a59':
  rtmpproto: Check for the right return code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'
Michael Niedermayer [Wed, 18 Sep 2013 08:39:34 +0000 (10:39 +0200)]
Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'

* commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2':
  dca_parser: Handle changes in DCA frame size

Conflicts:
libavcodec/dca_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: move "missing SIZ" check up
Michael Niedermayer [Wed, 18 Sep 2013 08:04:43 +0000 (10:04 +0200)]
avcodec/jpeg2000dec: move "missing SIZ" check up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'
Michael Niedermayer [Wed, 18 Sep 2013 07:40:53 +0000 (09:40 +0200)]
Merge commit '18a245a2aea31b92bc435f2962a71e060d83b5f7'

* commit '18a245a2aea31b92bc435f2962a71e060d83b5f7':
  jpeg2000dec: Add more checks when parsing headers

The check cannot be true in FFmpeg, but does no harm.
I will move it in a subsequent commit so it can detect missing SIZ

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: List merge commit hashes and version numbers
Michael Niedermayer [Tue, 17 Sep 2013 23:42:18 +0000 (01:42 +0200)]
doc/APIchanges: List merge commit hashes and version numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/v4l2: do not fail when VIDIOC_ENUMSTD returns EINVAL without a valid match
mrlika [Mon, 2 Sep 2013 12:10:22 +0000 (15:10 +0300)]
lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns EINVAL without a valid match

With some (buggy) drivers, the VIDIOC_G_STD ioctl returns a std_id that cannot
be matched with any of the enumerated v4l2_standard structures (for example
std_id = 0 or std_id = 0xffffff). Do not fail when we reach the end of the
enumeration without a valid match.

Fixes ticket #2370

Note: This commit message has been modified by Giorgio Vazzana, the original
commit message was:

"Fixed regression for mandatory VIDIOC_ENUMSTD support by v4l2"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: Add an option for omitting the tfhd base offset
Martin Storsjö [Mon, 9 Sep 2013 12:04:57 +0000 (15:04 +0300)]
movenc: Add an option for omitting the tfhd base offset

This makes the output fragments independent of their position in
the output stream, making the output work better when streamed.

QuickTime Player doesn't support fragmented mp4 without the base
data offset, though.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Write the moof atom in two passes
Martin Storsjö [Mon, 9 Sep 2013 09:05:01 +0000 (12:05 +0300)]
movenc: Write the moof atom in two passes

This is a bit more work, but avoids having to fill in
the data offset field afterwards instead of directly when
the rest of the trun atom is written.

This simplifies future cases where this field needs to be set to
something different.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotwinvqdec: Check the ibps parameter separately
Martin Storsjö [Tue, 17 Sep 2013 16:33:48 +0000 (19:33 +0300)]
twinvqdec: Check the ibps parameter separately

This is required, since invalid parameters actually could
pass the switch check below.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Support reading interleaved chunks.
Josh Allmann [Tue, 17 Sep 2013 06:58:48 +0000 (23:58 -0700)]
rtmp: Support reading interleaved chunks.

A given packet won't always come in contiguously; sometimes
they may be broken up on chunk boundaries by packets of another
channel.

This support primarily involves tracking information about the
data that's been read, so the reader can pick up where it left
off for a given channel.

As a side effect, we no longer over-report the bytes read if
(toread = MIN(size, chunk_size)) == size

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoswscale/utils: remove redundant NULL checks before sws_freeVec()
Michael Niedermayer [Tue, 17 Sep 2013 19:48:54 +0000 (21:48 +0200)]
swscale/utils: remove redundant NULL checks before sws_freeVec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/utils: simplify cpu caps printing code
Michael Niedermayer [Tue, 17 Sep 2013 19:31:58 +0000 (21:31 +0200)]
swscale/utils: simplify cpu caps printing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/utils: Simplify scaler name printing code
Michael Niedermayer [Tue, 17 Sep 2013 19:29:42 +0000 (21:29 +0200)]
swscale/utils: Simplify scaler name printing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoOpenCL: convert meaningless "device id" output to "device name"
Lenny Wang [Tue, 10 Sep 2013 07:57:54 +0000 (02:57 -0500)]
OpenCL: convert meaningless "device id" output to "device name"

Approved-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/smacker: use av_malloc_array() and check for allocation error
Paul B Mahol [Mon, 16 Sep 2013 18:20:08 +0000 (18:20 +0000)]
avformat/smacker: use av_malloc_array() and check for allocation error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/options_table: improve option help text
Michael Niedermayer [Mon, 16 Sep 2013 22:57:11 +0000 (00:57 +0200)]
lavf/options_table: improve option help text

Contains text suggested by carl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/asfenc: fix a build error
Chih-Wei Huang [Tue, 17 Sep 2013 15:36:48 +0000 (23:36 +0800)]
avformat/asfenc: fix a build error

It's introduced by the erroneous merging commit cbe47b1e.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/x86/vf_pullup: try to fix build on x64
Paul B Mahol [Tue, 17 Sep 2013 17:15:43 +0000 (17:15 +0000)]
avfilter/x86/vf_pullup: try to fix build on x64

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoxmv: Add more sanity checks for parameters read from the bitstream
Martin Storsjö [Mon, 16 Sep 2013 18:27:49 +0000 (21:27 +0300)]
xmv: Add more sanity checks for parameters read from the bitstream

Since the number of channels is multiplied by 36 and assigned to
to a uint16_t, make sure this calculation didn't overflow. (In
certain cases the calculation could overflow leaving the
truncated block_align at 0, leading to divisions by zero later.)

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmpproto: Extend a comment to explain the prev_pkt arrays roles
Martin Storsjö [Tue, 17 Sep 2013 14:43:48 +0000 (17:43 +0300)]
rtmpproto: Extend a comment to explain the prev_pkt arrays roles

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmpproto: Consistently use the right prev_pkt array
Martin Storsjö [Tue, 17 Sep 2013 13:53:11 +0000 (16:53 +0300)]
rtmpproto: Consistently use the right prev_pkt array

prev_pkt[0] is used for input packets, while prev_pkt[1] is
used for output.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmpproto: Check for the right return code
Martin Storsjö [Tue, 17 Sep 2013 12:07:10 +0000 (15:07 +0300)]
rtmpproto: Check for the right return code

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavfilter: port pullup filter from libmpcodecs
Paul B Mahol [Mon, 8 Jul 2013 12:42:53 +0000 (12:42 +0000)]
avfilter: port pullup filter from libmpcodecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodca_parser: Handle changes in DCA frame size
John Stebbins [Wed, 4 Sep 2013 20:08:22 +0000 (13:08 -0700)]
dca_parser: Handle changes in DCA frame size

A change in framesize caused a perpetual loss of synchronization.
So read (and use) the frame size from the frame header instead of
setting it only once.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agolavc: Don't export ff_vdpau_vc1_decode_picture
Derek Buitenhuis [Tue, 17 Sep 2013 13:34:03 +0000 (09:34 -0400)]
lavc: Don't export ff_vdpau_vc1_decode_picture

It's not our responsibility to account for other projects'
terrible hacky usage.

Also, it is no longer needed by XMBC, since 78b71d4.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoswscale/utils: Allow sws_setColorspaceDetails() to use the tables from sws_getColorsp...
Michael Niedermayer [Tue, 17 Sep 2013 15:21:13 +0000 (17:21 +0200)]
swscale/utils: Allow sws_setColorspaceDetails() to use the tables from sws_getColorspaceDetails()

Previously this would have lead to a memcpy(a,a) which violates the
requirement of non overlapping src and dst.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 17 Sep 2013 15:09:58 +0000 (17:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add missing hashes and dates to APIChanges

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'
Michael Niedermayer [Tue, 17 Sep 2013 14:55:16 +0000 (16:55 +0200)]
Merge commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2'

* commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2':
  ffv1: Make sure at least one slice context is initialized

Conflicts:
libavcodec/ffv1.c

This condition is not possible in ffmpegs ffv1 code and already
checked for by assert() for the case that some future changes make it possible.
Thus merge just for meta-data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'
Michael Niedermayer [Tue, 17 Sep 2013 14:47:18 +0000 (16:47 +0200)]
Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'

* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9':
  eacmv: Make sure a reference frame exists before referencing it

Conflicts:
libavcodec/eacmv.c

See: 113d7be62497c4e59db8f224fdb7f0a90cf17d03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'
Michael Niedermayer [Tue, 17 Sep 2013 14:39:16 +0000 (16:39 +0200)]
Merge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'

* commit 'c39f7eba01cd656e8f0eed592f93d11814736650':
  truemotion2: Use av_freep properly in an error path

Conflicts:
libavcodec/truemotion2.c

See: c54aa2fb0f869ec025933944cbd1634fffe95d09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f875a732e36786d49f3650e3235272891a820600'
Michael Niedermayer [Tue, 17 Sep 2013 14:26:59 +0000 (16:26 +0200)]
Merge commit 'f875a732e36786d49f3650e3235272891a820600'

* commit 'f875a732e36786d49f3650e3235272891a820600':
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

Conflicts:
libavcodec/mpeg4videodec.c

See: fc5c49ab3247533e0a5cb203cf7122143389eb5c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'
Michael Niedermayer [Tue, 17 Sep 2013 14:09:28 +0000 (16:09 +0200)]
Merge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'

* commit 'a92538b7c0defc86c55fb91f55dfa36aad192673':
  ivi_common: Make sure color planes have been initialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'
Michael Niedermayer [Tue, 17 Sep 2013 13:57:15 +0000 (15:57 +0200)]
Merge commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52'

* commit '7f8d41eb097e8d4223c9caf97dd332a2fdb29d52':
  mov: Don't use a negative duration for setting other fields

Conflicts:
libavformat/mov.c

See: 87d073eaccc00ef2909445ae4b25128c440d9efa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: downgrade log level for non fatal errors in open_input_file()
Stefano Sabatini [Mon, 16 Sep 2013 17:20:56 +0000 (19:20 +0200)]
ffprobe: downgrade log level for non fatal errors in open_input_file()

Since the errors are not fatal, it is less confusing not to show them as
errors but as warnings.

Arbitrarily fixes trac ticket #2419.

6 years agoMerge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'
Michael Niedermayer [Tue, 17 Sep 2013 13:50:21 +0000 (15:50 +0200)]
Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'

* commit '19b9659f3174599e8685d329c4330b1ea8c4c6db':
  oggparseogm: Convert to use bytestream2

Conflicts:
libavformat/oggparseogm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '711c970168297683860422e95d6b7e37ee3c8367'
Michael Niedermayer [Tue, 17 Sep 2013 13:37:04 +0000 (15:37 +0200)]
Merge commit '711c970168297683860422e95d6b7e37ee3c8367'

* commit '711c970168297683860422e95d6b7e37ee3c8367':
  rv34: Check the return value from ff_rv34_decode_init

Conflicts:
libavcodec/rv30.c
libavcodec/rv40.c

See: b86651a208ee67666a7305b002bc9f14b21dae7f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9'
Michael Niedermayer [Tue, 17 Sep 2013 13:21:52 +0000 (15:21 +0200)]
Merge commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9'

* commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9':
  matroskadec: Verify realaudio codec parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'
Michael Niedermayer [Tue, 17 Sep 2013 13:16:01 +0000 (15:16 +0200)]
Merge commit 'e1f3847f860a1094a46be4c5f10db8df616c3135'

* commit 'e1f3847f860a1094a46be4c5f10db8df616c3135':
  mace: Make sure that the channel count is set to a valid value

Conflicts:
libavcodec/mace.c

See: 6df1cfa7e4d488051d7b5033c0c69df970db9f82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1115689d54ea95a084421f5a182b8dc56cbff978'
Michael Niedermayer [Tue, 17 Sep 2013 13:07:09 +0000 (15:07 +0200)]
Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'

* commit '1115689d54ea95a084421f5a182b8dc56cbff978':
  svq3: Check for any negative return value from ff_h264_check_intra_pred_mode

Conflicts:
libavcodec/svq3.c

See: 019eb2c77b7c315580200a5dbe6dabb1c97a3764
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: Add more checks when parsing headers
Martin Storsjö [Mon, 16 Sep 2013 13:17:05 +0000 (16:17 +0300)]
jpeg2000dec: Add more checks when parsing headers

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: Add missing hashes and dates to APIChanges
Luca Barbato [Tue, 17 Sep 2013 10:47:09 +0000 (12:47 +0200)]
doc: Add missing hashes and dates to APIChanges

Also fix the typo in the last entry version.

6 years agoavformat/utils: Print warning if reallocating probe buffer failed
Michael Niedermayer [Tue, 17 Sep 2013 11:09:24 +0000 (13:09 +0200)]
avformat/utils: Print warning if reallocating probe buffer failed

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

* qatar/master:
  rtmp: rename main_channel_id to stream_id.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'
Michael Niedermayer [Tue, 17 Sep 2013 10:57:15 +0000 (12:57 +0200)]
Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'

* commit 'd4aef997809167832ecc64e89dda8cb445e5fe10':
  rtmp: Follow Flash player numbering for channels.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '120af23cd5fcfc539d9575d17d403247ab17109b'
Michael Niedermayer [Tue, 17 Sep 2013 10:52:19 +0000 (12:52 +0200)]
Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b'

* commit '120af23cd5fcfc539d9575d17d403247ab17109b':
  rtmp: Send video on a separate channel.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '68b467742092364f9306283f40effde2c12efe08'
Michael Niedermayer [Tue, 17 Sep 2013 10:37:04 +0000 (12:37 +0200)]
Merge commit '68b467742092364f9306283f40effde2c12efe08'

* commit '68b467742092364f9306283f40effde2c12efe08':
  lavf: Make probe_codec return an error code

Conflicts:
libavformat/utils.c

A failure to reallocate should not free the array as it is used
to probe the codec. And failure to reallocate if the following
probe succeeds isnt a fatal error for probe_codec(). Thus this
is only partially merged to ensure probing still is attempted
with the data available.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/fftools-common-opts: document -help long and full output
Stefano Sabatini [Mon, 16 Sep 2013 22:14:54 +0000 (00:14 +0200)]
doc/fftools-common-opts: document -help long and full output

6 years agoMerge commit '1daea5232fc9963ba93b1b6d07a2373f87c9b392'
Michael Niedermayer [Tue, 17 Sep 2013 10:21:47 +0000 (12:21 +0200)]
Merge commit '1daea5232fc9963ba93b1b6d07a2373f87c9b392'

* commit '1daea5232fc9963ba93b1b6d07a2373f87c9b392':
  x86: Add an xmm clobbering wrapper for avcodec_encode_video2

See: ede42109e73a0f836bca1a241369a5108003b91a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73084391588b0f150737990038829cac5013dd68'
Michael Niedermayer [Tue, 17 Sep 2013 10:16:55 +0000 (12:16 +0200)]
Merge commit '73084391588b0f150737990038829cac5013dd68'

* commit '73084391588b0f150737990038829cac5013dd68':
  lavf: Don't explicitly flush after each written packet in muxers

Conflicts:
libavformat/assenc.c
libavformat/yuv4mpeg.c

See: 8de9bb6e5e527e2bcc8b2cff2da4107ecef23421

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '596e5d4783ca951258a7c580951fd161f1785ec1'
Michael Niedermayer [Tue, 17 Sep 2013 10:01:35 +0000 (12:01 +0200)]
Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'

* commit '596e5d4783ca951258a7c580951fd161f1785ec1':
  lavf: Add a flag to enable/disable per-packet flushing

Conflicts:
libavformat/avformat.h
libavformat/mux.c
libavformat/version.h

This adds a 2nd API to set per packet flushing
If the user application indicates through either a non default then this non default takes
precedence over the other still default value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'
Michael Niedermayer [Tue, 17 Sep 2013 09:43:58 +0000 (11:43 +0200)]
Merge commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a'

* commit '0a9425d7cfdf0113c3d32096c9406823efe0cd0a':
  flv: Do not export datastream as metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '92ed83e393d25b6d15920e90d56ee77de54a9728'
Michael Niedermayer [Tue, 17 Sep 2013 09:39:41 +0000 (11:39 +0200)]
Merge commit '92ed83e393d25b6d15920e90d56ee77de54a9728'

* commit '92ed83e393d25b6d15920e90d56ee77de54a9728':
  rtmp: Store all the notify messages

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931'
Michael Niedermayer [Tue, 17 Sep 2013 09:34:24 +0000 (11:34 +0200)]
Merge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931'

* commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931':
  rtmp: Do not send the first field twice within the handshake

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

* commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf':
  rtmp: Drop an unneeded warning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'
Michael Niedermayer [Tue, 17 Sep 2013 09:22:51 +0000 (11:22 +0200)]
Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'

* commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825':
  rtmp: Support play method in listen mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a'
Michael Niedermayer [Tue, 17 Sep 2013 09:17:07 +0000 (11:17 +0200)]
Merge commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a'

* commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a':
  rtmp: Factor out publish specific code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'
Michael Niedermayer [Tue, 17 Sep 2013 09:05:19 +0000 (11:05 +0200)]
Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'

* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
  mem: Introduce av_reallocp

Conflicts:
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: Add an xmm clobbering wrapper for avcodec_encode_video2
Martin Storsjö [Mon, 16 Sep 2013 16:31:03 +0000 (19:31 +0300)]
x86: Add an xmm clobbering wrapper for avcodec_encode_video2

This is required since 187105ff8 when we started trying to
wrap this function as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'
Michael Niedermayer [Tue, 17 Sep 2013 08:38:48 +0000 (10:38 +0200)]
Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'

* commit '187105ff8a02bafc9c58d9d8363bb3f55a415635':
  Fix references to deleted avcodec_encode_video() function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: Make sure at least one slice context is initialized
Martin Storsjö [Mon, 16 Sep 2013 18:46:50 +0000 (21:46 +0300)]
ffv1: Make sure at least one slice context is initialized

This avoids crashes when initializing the range coder for
the first slice context.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoeacmv: Make sure a reference frame exists before referencing it
Martin Storsjö [Mon, 16 Sep 2013 18:07:30 +0000 (21:07 +0300)]
eacmv: Make sure a reference frame exists before referencing it

This is similar to an existing check for the second-last frame
from 062421e3.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotruemotion2: Use av_freep properly in an error path
Martin Storsjö [Mon, 16 Sep 2013 18:03:34 +0000 (21:03 +0300)]
truemotion2: Use av_freep properly in an error path

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory
Martin Storsjö [Mon, 16 Sep 2013 17:40:13 +0000 (20:40 +0300)]
mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

This avoids a potential division by zero.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoivi_common: Make sure color planes have been initialized
Martin Storsjö [Mon, 16 Sep 2013 17:32:35 +0000 (20:32 +0300)]
ivi_common: Make sure color planes have been initialized

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomov: Don't use a negative duration for setting other fields
Martin Storsjö [Mon, 16 Sep 2013 17:17:47 +0000 (20:17 +0300)]
mov: Don't use a negative duration for setting other fields

Some files have the duration set to -1 in the mdhd atom, more
or less legitimately. (We produce such files ourselves, for the
initial duration in fragmented mp4 files.)

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agooggparseogm: Convert to use bytestream2
Martin Storsjö [Mon, 16 Sep 2013 14:17:26 +0000 (17:17 +0300)]
oggparseogm: Convert to use bytestream2

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agorv34: Check the return value from ff_rv34_decode_init
Martin Storsjö [Mon, 16 Sep 2013 13:01:02 +0000 (16:01 +0300)]
rv34: Check the return value from ff_rv34_decode_init

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomatroskadec: Verify realaudio codec parameters
Martin Storsjö [Mon, 16 Sep 2013 12:36:24 +0000 (15:36 +0300)]
matroskadec: Verify realaudio codec parameters

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomace: Make sure that the channel count is set to a valid value
Martin Storsjö [Mon, 16 Sep 2013 12:19:52 +0000 (15:19 +0300)]
mace: Make sure that the channel count is set to a valid value

Also return a proper error code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosvq3: Check for any negative return value from ff_h264_check_intra_pred_mode
Martin Storsjö [Mon, 16 Sep 2013 12:05:03 +0000 (15:05 +0300)]
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode

Also pass on any returned error code.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: rename main_channel_id to stream_id.
Josh Allmann [Mon, 16 Sep 2013 20:20:58 +0000 (13:20 -0700)]
rtmp: rename main_channel_id to stream_id.

This more closely corresponds to the usage of the field.
Its usage here is unrelated to the channel ID.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Follow Flash player numbering for channels.
Josh Allmann [Mon, 16 Sep 2013 20:20:57 +0000 (13:20 -0700)]
rtmp: Follow Flash player numbering for channels.

Channel 4 is typically used by the Flash player to transmit
audio, channel 6 for video, and various stream-specific invokes
get sent over channel 8, which is designated the source channel.

This more closely matches the behavior of the Flash player,
including the transmission of play requests over channel 8.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Send video on a separate channel.
Josh Allmann [Mon, 16 Sep 2013 20:20:56 +0000 (13:20 -0700)]
rtmp: Send video on a separate channel.

Sending non-monotonic packets (e.g. when the audio and video
streams are monotonic within themselves but not muxed
monotonically) will lead to negative values the RTMP timestamp
field (where timestamps are transmitted only as deltas for each
channel), and this delta can end up being incorrectly written as
a large unsigned number.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/mjpegdec: Fix ljpeg RCT
Michael Niedermayer [Tue, 17 Sep 2013 00:00:15 +0000 (02:00 +0200)]
avcodec/mjpegdec: Fix ljpeg RCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 16 Sep 2013 22:27:37 +0000 (00:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to increase probesize for image2 files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDo not suggest to increase probesize for image2 files.
Carl Eugen Hoyos [Mon, 16 Sep 2013 22:08:12 +0000 (00:08 +0200)]
Do not suggest to increase probesize for image2 files.

6 years agolavf/oggopus: Fixing a log message
Vignesh Venkatasubramanian [Mon, 16 Sep 2013 20:47:21 +0000 (13:47 -0700)]
lavf/oggopus: Fixing a log message

Re-wording a log message that's no longer true and changing its
severity level to debug.

Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/avienc: use av_freep() avoid stale pointers
Michael Niedermayer [Mon, 16 Sep 2013 20:49:17 +0000 (22:49 +0200)]
lavf/avienc: use av_freep() avoid stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/yuv2rgb: make sure yuvTable is set to NULL after deallocation
Michael Niedermayer [Mon, 16 Sep 2013 20:47:21 +0000 (22:47 +0200)]
swscale/yuv2rgb: make sure yuvTable is set to NULL after deallocation

ensures no stale pointers remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample: replace 2 av_free() by av_freep()
Michael Niedermayer [Mon, 16 Sep 2013 20:44:15 +0000 (22:44 +0200)]
swresample: replace 2 av_free() by av_freep()

avoids leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: Make probe_codec return an error code
Alexandra Khirnova [Thu, 12 Sep 2013 08:39:22 +0000 (10:39 +0200)]
lavf: Make probe_codec return an error code

This allows handling errors from av_realloc properly.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: Add an xmm clobbering wrapper for avcodec_encode_video2
Martin Storsjö [Mon, 16 Sep 2013 16:31:03 +0000 (19:31 +0300)]
x86: Add an xmm clobbering wrapper for avcodec_encode_video2

This is required since 187105ff8 when we started trying to
wrap this function as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavf: Don't explicitly flush after each written packet in muxers
Clément Bœsch [Sun, 24 Mar 2013 23:23:46 +0000 (00:23 +0100)]
lavf: Don't explicitly flush after each written packet in muxers

Since 596e5d4783, this is not necessary anymore. It also allows to
actually disable the flushing, improving write performance (but
possibly giving worse latency in real-time streaming).

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