ffmpeg.git
4 years agoMerge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'
Michael Niedermayer [Thu, 6 Nov 2014 13:17:34 +0000 (14:17 +0100)]
Merge commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48'

* commit 'acc897e6b15776ed438b88ffe330ec48f6b50e48':
  lavc: make avpriv_flac_is_extradata_valid() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'
Michael Niedermayer [Thu, 6 Nov 2014 13:09:35 +0000 (14:09 +0100)]
Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'

* commit 'e839de0f851535b5e19256b52f9865f0cb768a7c':
  oggenc: accept only STREAMINFO extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c070a8751597e3aa1b443e88464da785d8966b14'
Michael Niedermayer [Thu, 6 Nov 2014 12:54:03 +0000 (13:54 +0100)]
Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'

* commit 'c070a8751597e3aa1b443e88464da785d8966b14':
  lavc: make avpriv_flac_parse_streaminfo() private on the next bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'
Michael Niedermayer [Thu, 6 Nov 2014 12:41:07 +0000 (13:41 +0100)]
Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'

* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'
Michael Niedermayer [Thu, 6 Nov 2014 12:18:42 +0000 (13:18 +0100)]
Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'

* commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe':
  riffenc: do not fall back on AVCodecContext.frame_size for MP3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'
Michael Niedermayer [Thu, 6 Nov 2014 12:10:01 +0000 (13:10 +0100)]
Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'

* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
  lavf: use the format context strict_std_compliance instead of the codec one

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/oggparsevorbis: Check that initialization succeeded before declaring the...
Michael Niedermayer [Thu, 6 Nov 2014 11:58:04 +0000 (12:58 +0100)]
avformat/oggparsevorbis: Check that initialization succeeded before declaring the end of headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/oggparsevorbis: return proper error code from vorbis_header()
Michael Niedermayer [Thu, 6 Nov 2014 12:01:06 +0000 (13:01 +0100)]
avformat/oggparsevorbis: return proper error code from vorbis_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'
Michael Niedermayer [Thu, 6 Nov 2014 11:05:17 +0000 (12:05 +0100)]
Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'

* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
  lavc,lavf: switch to the new vorbis parse API

Conflicts:
libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/export av_vorbis_parse_frame_flags()
Michael Niedermayer [Thu, 6 Nov 2014 10:54:40 +0000 (11:54 +0100)]
avcodec/export av_vorbis_parse_frame_flags()

The other functions where changed in the previous merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'
Michael Niedermayer [Thu, 6 Nov 2014 10:21:47 +0000 (11:21 +0100)]
Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'

* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/version.h
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'
Michael Niedermayer [Thu, 6 Nov 2014 10:00:42 +0000 (11:00 +0100)]
Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'

* commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67':
  vorbis_parser: add an AV prefix to VorbisParseContext

Conflicts:
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8747926'
Michael Niedermayer [Thu, 6 Nov 2014 09:50:59 +0000 (10:50 +0100)]
Merge commit '8747926'

* commit '8747926':
  vorbis_parser: use a dedicated AVClass for logging

Conflicts:
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: make avpriv_flac_is_extradata_valid() private on the next bump
Anton Khirnov [Thu, 28 Aug 2014 18:42:56 +0000 (18:42 +0000)]
lavc: make avpriv_flac_is_extradata_valid() private on the next bump

4 years agooggenc: accept only STREAMINFO extradata
Anton Khirnov [Thu, 28 Aug 2014 18:51:51 +0000 (18:51 +0000)]
oggenc: accept only STREAMINFO extradata

The reasoning is the same as for
0097cbea695e534fce39958ccd103af2fbf65831.

4 years agolavc: make avpriv_flac_parse_streaminfo() private on the next bump
Anton Khirnov [Thu, 28 Aug 2014 18:42:56 +0000 (18:42 +0000)]
lavc: make avpriv_flac_parse_streaminfo() private on the next bump

4 years agolavf: stop using avpriv_flac_parse_streaminfo()
Anton Khirnov [Thu, 28 Aug 2014 10:13:25 +0000 (10:13 +0000)]
lavf: stop using avpriv_flac_parse_streaminfo()

The only parameters needed by the demuxers are the sample rate and sample
count, which can be trivially extracted manually, without resorting to
an avpriv function.

4 years agoriffenc: do not fall back on AVCodecContext.frame_size for MP3
Anton Khirnov [Sun, 24 Aug 2014 10:28:32 +0000 (10:28 +0000)]
riffenc: do not fall back on AVCodecContext.frame_size for MP3

It will not be set unless the codec context is used as the encoding
context, which is discouraged. For MP2, av_get_audio_frame_duration()
will already set the frame size properly. For MP3, set the frame size
explicitly.

4 years agolavf: use the format context strict_std_compliance instead of the codec one
Anton Khirnov [Sat, 5 Jul 2014 09:56:16 +0000 (09:56 +0000)]
lavf: use the format context strict_std_compliance instead of the codec one

4 years agolavc,lavf: switch to the new vorbis parse API
Anton Khirnov [Wed, 29 Oct 2014 15:35:26 +0000 (16:35 +0100)]
lavc,lavf: switch to the new vorbis parse API

4 years agolavc: add a public API for parsing vorbis packets.
Anton Khirnov [Wed, 29 Oct 2014 14:04:23 +0000 (15:04 +0100)]
lavc: add a public API for parsing vorbis packets.

It is required by (at least) the ogg demuxer.

Mark the current semi-public apriv API for removal.

4 years agovorbis_parser: add an AV prefix to VorbisParseContext
Anton Khirnov [Wed, 29 Oct 2014 13:33:32 +0000 (14:33 +0100)]
vorbis_parser: add an AV prefix to VorbisParseContext

This is done in preparation for making it public.

4 years agovorbis_parser: use a dedicated AVClass for logging
Anton Khirnov [Wed, 29 Oct 2014 13:18:06 +0000 (14:18 +0100)]
vorbis_parser: use a dedicated AVClass for logging

Currently, the API takes an external AVCodecContext, which is used only
for extradata and logging. This change will allow to it to work without
an AVCodecContext in the following commits.

4 years agoavcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation
Michael Niedermayer [Wed, 5 Nov 2014 23:04:51 +0000 (00:04 +0100)]
avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation

Fixes Ticket3918

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: init sub2video.last_pts.
Nicolas George [Sat, 1 Nov 2014 13:38:02 +0000 (14:38 +0100)]
ffmpeg: init sub2video.last_pts.

Get the heartbeat working when the video has negative timestamps.

Fix trac ticket #4062.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovdpau_mpeg4: Do not fail on unknown profile.
Reimar Döffinger [Sat, 1 Nov 2014 12:44:21 +0000 (13:44 +0100)]
vdpau_mpeg4: Do not fail on unknown profile.

This is a regression, previous code did not require
users to set the profile to use VDPAU.
In addition, ASP is a superset of SP, so there is not
even a good reason to require it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agov4l2: support MPEG4 compressed streams
Andrey Utkin [Wed, 5 Nov 2014 12:38:30 +0000 (16:38 +0400)]
v4l2: support MPEG4 compressed streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/time_internal: do not attempt to override *time_r() macros
Michael Niedermayer [Wed, 5 Nov 2014 17:44:15 +0000 (18:44 +0100)]
avutil/time_internal: do not attempt to override *time_r() macros

Fixes build on somewhat odd setups with mingw
Fixes Ticket4075

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: add a repeated field detection
Kevin Mitchell [Sun, 2 Nov 2014 12:49:34 +0000 (04:49 -0800)]
avfilter/vf_idet: add a repeated field detection

This can be useful for determining telecine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/udp: UDP-Lite (RFC 3828) support added
Thomas Volkert [Wed, 5 Nov 2014 09:59:44 +0000 (10:59 +0100)]
avformat/udp: UDP-Lite (RFC 3828) support added

(This fixes ticket #1501)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'
Michael Niedermayer [Wed, 5 Nov 2014 09:17:07 +0000 (10:17 +0100)]
Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'

* commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404':
  rtmpproto: Ignore errors from the getStreamLength method

Conflicts:
libavformat/rtmpproto.c

See: 09711545f5d256bd3ac77004d123dae36c5db8f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortmpproto: Ignore errors from the getStreamLength method
Martin Storsjö [Tue, 4 Nov 2014 07:23:35 +0000 (09:23 +0200)]
rtmpproto: Ignore errors from the getStreamLength method

It is never an error if this method failed. If rt->live was
explicitly set to 0 (known to be a recorded file), print it
as a warning, otherwise print it as a debug message.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc: clarify -frames options behavior
Lou Logan [Tue, 4 Nov 2014 19:17:45 +0000 (10:17 -0900)]
doc: clarify -frames options behavior

Replace "frames to record" with "frames to output". The "to record"
makes it seem like an input option, or that it would capture the frames
instead of outputting them.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoMerge commit '4ff670d99bebd97429322719089363d83143477d'
Michael Niedermayer [Wed, 5 Nov 2014 01:10:29 +0000 (02:10 +0100)]
Merge commit '4ff670d99bebd97429322719089363d83143477d'

* commit '4ff670d99bebd97429322719089363d83143477d':
  hwaccel: Deinitialize hardware acceleration early enough

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: do not trust AVCodecContext input dimensions
Michael Niedermayer [Wed, 5 Nov 2014 00:21:59 +0000 (01:21 +0100)]
avcodec/mpeg12dec: do not trust AVCodecContext input dimensions

Fixes initial wtv dimensions
Fixes Ticket4070
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoUse -fno-optimize-sibling-calls on parisc also for gcc 4.9.
Carl Eugen Hoyos [Wed, 5 Nov 2014 00:35:48 +0000 (01:35 +0100)]
Use -fno-optimize-sibling-calls on parisc also for gcc 4.9.

Fixes fate on hppa.
Found-by: Andreas Cadhalpun.
4 years agoMerge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'
Michael Niedermayer [Tue, 4 Nov 2014 21:33:09 +0000 (22:33 +0100)]
Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'

* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2':
  aacdec: add default case in channel layout

Conflicts:
libavcodec/aacdec.c

Note, the default case is currently unreachable

See: a48b890392aa22033f182421ba9e3f3b3256461d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohwaccel: Deinitialize hardware acceleration early enough
Rémi Denis-Courmont [Wed, 29 Oct 2014 17:07:20 +0000 (19:07 +0200)]
hwaccel: Deinitialize hardware acceleration early enough

The application will destroy the underlying hardware handles when
get_format() gets called again. Also this ensures the
deinitialization takes place if the get_format callback returns an
error.

Regression from 1c80c9d7ef809180042257200c7b5f6b81d0b0e2.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoMerge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'
Michael Niedermayer [Tue, 4 Nov 2014 21:03:44 +0000 (22:03 +0100)]
Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'

* commit '930ffd46e1e742674aa7cc1c2450020c63b5015b':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
libavcodec/aacsbr.c

See: c2340831b8e9032716acb0aab4893d3cc500213a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1'
Michael Niedermayer [Tue, 4 Nov 2014 20:52:58 +0000 (21:52 +0100)]
Merge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1'

* commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1':
  aacsbr: treat 1-d arrays as such

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f52b8717617e94da90a45afdfff23e94f9ecf35c'
Michael Niedermayer [Tue, 4 Nov 2014 20:38:07 +0000 (21:38 +0100)]
Merge commit 'f52b8717617e94da90a45afdfff23e94f9ecf35c'

* commit 'f52b8717617e94da90a45afdfff23e94f9ecf35c':
  celp_filters: don't use filter lenght as loop bound

See: 3f010421421ff0af916cf16313a111dae71f837d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0'
Michael Niedermayer [Tue, 4 Nov 2014 20:17:29 +0000 (21:17 +0100)]
Merge commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0'

* commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0':
  error_resilience: initialize prev_* variables

Note, these variables are not used without initialization prior
to the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'
Michael Niedermayer [Tue, 4 Nov 2014 20:09:13 +0000 (21:09 +0100)]
Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'

* commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26':
  motion_est: remove dead code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'
Michael Niedermayer [Tue, 4 Nov 2014 20:01:39 +0000 (21:01 +0100)]
Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'

* commit '351d0f8b7a6ecce411ae75fb3511573c34317218':
  get_bits: remove unused assignment

Conflicts:
libavcodec/get_bits.h

See: ea6178fff8ee0ccf145a2cbd5ab3c1bf73cd03d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: store canvas size in decoder context
Michael Niedermayer [Tue, 4 Nov 2014 19:19:04 +0000 (20:19 +0100)]
ffmpeg_opt: store canvas size in decoder context

Fixes canvas size
Fixes Ticket4074

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: fix iteration count in add_pid_to_pmt()
Michael Niedermayer [Tue, 4 Nov 2014 18:31:59 +0000 (19:31 +0100)]
avformat/mpegts: fix iteration count in add_pid_to_pmt()

Fixes accessing uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_aresample: Limit data per inserted packet
Michael Niedermayer [Tue, 4 Nov 2014 15:01:07 +0000 (16:01 +0100)]
avfilter/af_aresample: Limit data per inserted packet

This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_aresample: split flushing code out
Michael Niedermayer [Tue, 4 Nov 2014 15:00:07 +0000 (16:00 +0100)]
avfilter/af_aresample: split flushing code out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Fix swr_drop_output so it does not flush the buffers
Michael Niedermayer [Tue, 4 Nov 2014 15:54:14 +0000 (16:54 +0100)]
swresample: Fix swr_drop_output so it does not flush the buffers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacdec: add default case in channel layout
Vittorio Giovara [Thu, 30 Oct 2014 00:52:01 +0000 (00:52 +0000)]
aacdec: add default case in channel layout

Bug-Id: CID 732291

4 years agoaacsbr: change order of operation to prevent out of array read
Michael Niedermayer [Thu, 30 Oct 2014 00:52:04 +0000 (00:52 +0000)]
aacsbr: change order of operation to prevent out of array read

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

4 years agoid3v2: prefer TDRC for date over TDRL.
Benoit Fouet [Tue, 4 Nov 2014 12:54:43 +0000 (13:54 +0100)]
id3v2: prefer TDRC for date over TDRL.

TDRL is what we used as a replacement of TYER, and, according to
http://id3.org/id3v2.4.0-changes :
    TYER - Year
        This frame is replaced by the TDRC frame, 'Recording time'
        [F:4.2.5].
So change TDRL usages to TDRC.

Fixes ticket #3694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: also print PMT version in av_dlog()
Michael Niedermayer [Tue, 4 Nov 2014 00:18:39 +0000 (01:18 +0100)]
avformat/mpegts: also print PMT version in av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtmpproto: Do not fail when the length cannot be determined for live streams
Michael Niedermayer [Mon, 3 Nov 2014 23:35:32 +0000 (00:35 +0100)]
avformat/rtmpproto: Do not fail when the length cannot be determined for live streams

Fixes Ticket4071

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: Continue parsing PMTs during duration estimation
Michael Niedermayer [Mon, 3 Nov 2014 21:55:07 +0000 (22:55 +0100)]
avformat/mpegts: Continue parsing PMTs during duration estimation

This way if we by chance run into a valid PMT we have a more complete
set of streams, also do not reset streams in case we run into a worse
PMT

Fixes Ticket4046

alternatively Ticket4046 could be closed as invalid or wontfix as it contains
some PMTs which lack the 2 subtitle streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Leave skip_clear enabled until after estimate_timings()
Michael Niedermayer [Mon, 3 Nov 2014 21:53:48 +0000 (22:53 +0100)]
avformat/utils: Leave skip_clear enabled until after estimate_timings()

Should make no difference but will be needed for subsequent commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()
Michael Niedermayer [Mon, 3 Nov 2014 21:23:54 +0000 (22:23 +0100)]
avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libwebpenc: add quality option
Michael Niedermayer [Sat, 1 Nov 2014 19:28:31 +0000 (20:28 +0100)]
avcodec/libwebpenc: add quality option

previously quality could only be set through qscale/global_quality but the scale
was inverted. Using a separate option avoids the confusion from qscale working
backward.

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Clément Bœsch <u@pkh.me>
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: Better documentation for the bitexact flag
Michael Niedermayer [Fri, 31 Oct 2014 22:45:43 +0000 (23:45 +0100)]
doc: Better documentation for the bitexact flag

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacsbr: treat 1-d arrays as such
Vittorio Giovara [Thu, 30 Oct 2014 00:52:03 +0000 (00:52 +0000)]
aacsbr: treat 1-d arrays as such

CC: libav-stable@libav.org
Bug-Id: CID 1238802 / CID 1238793 / CID 1238785
        CID 1238808 / CID 1238809

4 years agocelp_filters: don't use filter lenght as loop bound
Vittorio Giovara [Thu, 30 Oct 2014 00:51:56 +0000 (00:51 +0000)]
celp_filters: don't use filter lenght as loop bound

CC: libav-stable@libav.org
Bug-Id: CID 717906 / CID 717907 / CID 717916 /
        CID 717917 / CID 717919 / CID 732259

4 years agoerror_resilience: initialize prev_* variables
Vittorio Giovara [Thu, 30 Oct 2014 00:51:57 +0000 (00:51 +0000)]
error_resilience: initialize prev_* variables

CC: libav-stable@libav.org
Bug-Id: CID 732293 / CID 732294

4 years agoavfilter/vf_idet: use exp2()
Michael Niedermayer [Mon, 3 Nov 2014 16:22:33 +0000 (17:22 +0100)]
avfilter/vf_idet: use exp2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: use av_rescale()
Michael Niedermayer [Mon, 3 Nov 2014 16:22:16 +0000 (17:22 +0100)]
avfilter/vf_idet: use av_rescale()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: fix rounding of av_dict_set_fxp()
Michael Niedermayer [Mon, 3 Nov 2014 16:14:29 +0000 (17:14 +0100)]
avfilter/vf_idet: fix rounding of av_dict_set_fxp()

fixes the remainder overflowing beyond .999

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: add a "half_life" option for statistics
Kevin Mitchell [Mon, 3 Nov 2014 05:30:51 +0000 (21:30 -0800)]
avfilter/vf_idet: add a "half_life" option for statistics

This can be useful for videos in which the interlacing pattern changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomotion_est: remove dead code
Vittorio Giovara [Thu, 30 Oct 2014 00:51:52 +0000 (00:51 +0000)]
motion_est: remove dead code

mb_type is initialized to 0 and never updated before the check.

Bug-Id: CID 1238782

4 years agoget_bits: remove unused assignment
Vittorio Giovara [Thu, 30 Oct 2014 00:51:51 +0000 (00:51 +0000)]
get_bits: remove unused assignment

Bug-Id: CID 1238816

4 years agoconfigure: add xcb cflags and extralibs to cflags and extralibs.
Benoit Fouet [Mon, 3 Nov 2014 10:04:25 +0000 (11:04 +0100)]
configure: add xcb cflags and extralibs to cflags and extralibs.

Replace xcb_event by xcb, as the former is no more used and the latter
is needed on configurations where only xcb is available, and not
libxcb_shm and/or libxcb_xfixes.

Signed-off-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/options_table fix min of audio channels and sample rate
Michael Niedermayer [Mon, 3 Nov 2014 12:20:24 +0000 (13:20 +0100)]
avcodec/options_table fix min of audio channels and sample rate

Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2f221b6a9365aa400061e16266f2d1242f7169f8'
Michael Niedermayer [Mon, 3 Nov 2014 10:52:52 +0000 (11:52 +0100)]
Merge commit '2f221b6a9365aa400061e16266f2d1242f7169f8'

* commit '2f221b6a9365aa400061e16266f2d1242f7169f8':
  movenc: Define the flag bits using shifts instead of as decimal numbers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Define the flag bits using shifts instead of as decimal numbers
Martin Storsjö [Sun, 2 Nov 2014 15:01:10 +0000 (17:01 +0200)]
movenc: Define the flag bits using shifts instead of as decimal numbers

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolavf/flvenc: fail in case the muxed packet is too big
Stefano Sabatini [Sun, 2 Nov 2014 23:28:06 +0000 (00:28 +0100)]
lavf/flvenc: fail in case the muxed packet is too big

Avoid the creation of files which cannot be successfully decoded by
ffmpeg, for example generated with:
ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv

4 years agoREADME: fix 2 typo in the doc/examples sentence
Clément Bœsch [Mon, 3 Nov 2014 08:20:27 +0000 (09:20 +0100)]
README: fix 2 typo in the doc/examples sentence

4 years agoffserver_config: add fixme on buffer_aggressivity/eq deprecation
Reynaldo H. Verdejo Pinochet [Mon, 3 Nov 2014 01:10:54 +0000 (22:10 -0300)]
ffserver_config: add fixme on buffer_aggressivity/eq deprecation

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver_config: simplify some if true conditions
Reynaldo H. Verdejo Pinochet [Mon, 3 Nov 2014 00:56:04 +0000 (21:56 -0300)]
ffserver_config: simplify some if true conditions

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver_config: fix line lengths
Reynaldo H. Verdejo Pinochet [Mon, 3 Nov 2014 00:54:23 +0000 (21:54 -0300)]
ffserver_config: fix line lengths

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoSilence warnings for fic files with zero-sized cursors.
Carl Eugen Hoyos [Sun, 2 Nov 2014 23:43:08 +0000 (00:43 +0100)]
Silence warnings for fic files with zero-sized cursors.

Fixes ticket #4072.

4 years agolavf/movenc: Write G.726 bitrate to make the files decodable.
Carl Eugen Hoyos [Sun, 2 Nov 2014 23:38:13 +0000 (00:38 +0100)]
lavf/movenc: Write G.726 bitrate to make the files decodable.

Fixes ticket #4069.

4 years agoffserver_config: improve AVOption handing
Lukasz Marek [Sat, 1 Nov 2014 18:17:01 +0000 (19:17 +0100)]
ffserver_config: improve AVOption handing

AVOption are checked right after found in config file.
It allows to report exact line in config file.

Options provided more than once are threated as errors.

It also fixes flag options handing.
Flags may occur more than once in config file.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoffserver_config: improve error handling
Lukasz Marek [Sat, 1 Nov 2014 01:09:44 +0000 (02:09 +0100)]
ffserver_config: improve error handling

Replace atoi with more advanced parsing routine.
Set maximum port value to 65535 (not 65536).
Other checks.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoavformat/img2enc: Use localtime_r() for thread saftey
Michael Niedermayer [Sun, 2 Nov 2014 19:09:16 +0000 (20:09 +0100)]
avformat/img2enc: Use localtime_r() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/sbgdec: Use localtime_r() for thread saftey
Michael Niedermayer [Sun, 2 Nov 2014 19:08:59 +0000 (20:08 +0100)]
avformat/sbgdec: Use localtime_r() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wavenc: Use localtime_r() for thread saftey
Michael Niedermayer [Sun, 2 Nov 2014 19:08:12 +0000 (20:08 +0100)]
avformat/wavenc: Use localtime_r() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: use time_internal.h, simplify code
Michael Niedermayer [Sun, 2 Nov 2014 19:07:34 +0000 (20:07 +0100)]
avformat/segment: use time_internal.h, simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/jacosubdec: use time_internal.h, simplify code
Michael Niedermayer [Sun, 2 Nov 2014 19:06:08 +0000 (20:06 +0100)]
avcodec/jacosubdec: use time_internal.h, simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_drawtext: use gm_time_r() for thread saftey
Michael Niedermayer [Sun, 2 Nov 2014 18:20:26 +0000 (19:20 +0100)]
avfilter/vf_drawtext: use gm_time_r() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskadec: use gmtime_r() for thread saftey
Michael Niedermayer [Sun, 2 Nov 2014 18:19:07 +0000 (19:19 +0100)]
avformat/matroskadec: use gmtime_r() for thread saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/webpenc: removed unused variable
Michael Niedermayer [Sun, 2 Nov 2014 10:43:48 +0000 (11:43 +0100)]
avformat/webpenc: removed unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: Clear table pointers to avoid stale pointers
Michael Niedermayer [Sun, 2 Nov 2014 00:55:40 +0000 (01:55 +0100)]
avcodec/h264_slice: Clear table pointers to avoid stale pointers

Might fix Ticket3889

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/img2enc: remove webp extension as we have a dedicated webp muxer
Michael Niedermayer [Sat, 1 Nov 2014 23:52:29 +0000 (00:52 +0100)]
avformat/img2enc: remove webp extension as we have a dedicated webp muxer

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver_config: dont pass pointer to enum as pointer to int
Lukasz Marek [Sat, 1 Nov 2014 01:59:59 +0000 (02:59 +0100)]
ffserver_config: dont pass pointer to enum as pointer to int

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
4 years agoavcodec/libwebpenc: support "P" frames in webp animations
Michael Niedermayer [Fri, 31 Oct 2014 15:39:56 +0000 (16:39 +0100)]
avcodec/libwebpenc: support "P" frames in webp animations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: add webp muxer
Michael Niedermayer [Fri, 31 Oct 2014 15:10:33 +0000 (16:10 +0100)]
avformat: add webp muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/assenc: Add ignore_gaps option
Rodger Combs [Fri, 31 Oct 2014 01:16:08 +0000 (20:16 -0500)]
avformat/assenc: Add ignore_gaps option

Signed-off-by: Clément Bœsch <u@pkh.me>
4 years agoavfilter/idet: add current frame classification to metadata
Kevin Mitchell [Sat, 1 Nov 2014 11:10:15 +0000 (04:10 -0700)]
avfilter/idet: add current frame classification to metadata

Fixes ticket 3832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/idet: add metadata to "current" frame instead of "next" frame
Kevin Mitchell [Sat, 1 Nov 2014 11:10:15 +0000 (04:10 -0700)]
avfilter/idet: add metadata to "current" frame instead of "next" frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpdec_h261: code aligned to the HEVC code
Thomas Volkert [Sat, 1 Nov 2014 12:01:53 +0000 (13:01 +0100)]
avformat/rtpdec_h261: code aligned to the HEVC code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg4vdpau: Fix priv data size.
Reimar Döffinger [Sat, 1 Nov 2014 12:01:38 +0000 (13:01 +0100)]
mpeg4vdpau: Fix priv data size.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agoavcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 1 Nov 2014 10:22:06 +0000 (11:22 +0100)]
avcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory

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