ffmpeg.git
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agolavf: Add a flag to enable/disable per-packet flushing
Luca Barbato [Wed, 11 Sep 2013 12:02:06 +0000 (14:02 +0200)]
lavf: Add a flag to enable/disable per-packet flushing

This is enabled by default and can be disabled with
"-fflags -flush_packets".

Inspired by a patch from Nicolas George <nicolas.george@normalesup.org>.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat/avidec: use av_calloc() and check for allocation error
Paul B Mahol [Mon, 16 Sep 2013 17:22:28 +0000 (17:22 +0000)]
avformat/avidec: use av_calloc() and check for allocation error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavf/ogg: Support for end trimming Opus
Vignesh Venkatasubramanian [Thu, 12 Sep 2013 17:24:18 +0000 (10:24 -0700)]
lavf/ogg: Support for end trimming Opus

Adding support for end trimming Opus embedded in Ogg container.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflv: Do not export datastream as metadata
Luca Barbato [Mon, 16 Sep 2013 16:09:12 +0000 (18:09 +0200)]
flv: Do not export datastream as metadata

It is used internally.

5 years agortmp: Store all the notify messages
Luca Barbato [Mon, 16 Sep 2013 15:42:59 +0000 (17:42 +0200)]
rtmp: Store all the notify messages

The onTextData is used to implement text data streams in flv.

5 years agortmp: Do not send the first field twice within the handshake
Luca Barbato [Mon, 16 Sep 2013 09:39:45 +0000 (11:39 +0200)]
rtmp: Do not send the first field twice within the handshake

5 years agortmp: Drop an unneeded warning
Luca Barbato [Mon, 16 Sep 2013 09:37:48 +0000 (11:37 +0200)]
rtmp: Drop an unneeded warning

Apparently a widely used streaming server requires that the second
field always presents a version during C1 phase.

5 years agortmp: Support play method in listen mode
Luca Barbato [Sun, 15 Sep 2013 14:52:33 +0000 (16:52 +0200)]
rtmp: Support play method in listen mode

5 years agortmp: Factor out publish specific code
Luca Barbato [Sat, 14 Sep 2013 14:41:50 +0000 (16:41 +0200)]
rtmp: Factor out publish specific code

Will be reused for supporting play.

5 years agomem: Introduce av_reallocp
Luca Barbato [Sun, 15 Sep 2013 19:42:07 +0000 (21:42 +0200)]
mem: Introduce av_reallocp

5 years agodoc/formats: Add documentation for 3 parameters that have been missing
Timothy Gu [Mon, 16 Sep 2013 02:08:58 +0000 (19:08 -0700)]
doc/formats: Add documentation for 3 parameters that have been missing

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: add adelay filter
Paul B Mahol [Fri, 13 Sep 2013 11:36:52 +0000 (11:36 +0000)]
avfilter: add adelay filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/segafilm: remove deplanarization hack
Paul B Mahol [Mon, 16 Sep 2013 13:30:20 +0000 (13:30 +0000)]
avformat/segafilm: remove deplanarization hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/segafilm: use av_freep()
Paul B Mahol [Mon, 16 Sep 2013 13:12:45 +0000 (13:12 +0000)]
avformat/segafilm: use av_freep()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavformat/sierravmd: use av_freep() for freeing context fields
Michael Niedermayer [Mon, 16 Sep 2013 12:39:45 +0000 (14:39 +0200)]
avformat/sierravmd: use av_freep() for freeing context fields

This ensures that there are no stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_stereod3d: add const qualifiers to ana_convert()
Paul B Mahol [Mon, 16 Sep 2013 10:50:12 +0000 (10:50 +0000)]
avfilter/vf_stereod3d: add const qualifiers to ana_convert()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/vf_stereo3d: BGR24 support for anaglyphs
Paul B Mahol [Mon, 16 Sep 2013 10:33:04 +0000 (10:33 +0000)]
avfilter/vf_stereo3d: BGR24 support for anaglyphs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/vf_stereo3d: avoid pointless copy
Paul B Mahol [Mon, 16 Sep 2013 10:31:14 +0000 (10:31 +0000)]
avfilter/vf_stereo3d: avoid pointless copy

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 16 Sep 2013 12:21:47 +0000 (14:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avpacket: Fix error checking in packet_alloc

Conflicts:
libavcodec/avpacket.c

See: b905a7137a51a9a4f66d75172897d1f38c0b292a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 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>
5 years agoFix references to deleted avcodec_encode_video() function
Vittorio Giovara [Tue, 10 Sep 2013 10:31:46 +0000 (12:31 +0200)]
Fix references to deleted avcodec_encode_video() function

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agoavpacket: Fix error checking in packet_alloc
Martin Storsjö [Wed, 11 Sep 2013 20:09:37 +0000 (23:09 +0300)]
avpacket: Fix error checking in packet_alloc

Previously the wrong buffer pointer was checked, when buf
instead of *buf was checked. But checking the return value
instead is even better.

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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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*