ffmpeg.git
5 years agoPrint an error if -r and -vsync 0 are used together.
Carl Eugen Hoyos [Thu, 23 Oct 2014 21:27:46 +0000 (23:27 +0200)]
Print an error if -r and -vsync 0 are used together.

Fixes ticket #4041.

5 years agoavformat/http: pass return code from http_open_cnx_internal() on its failure
Andrey Utkin [Thu, 23 Oct 2014 16:55:46 +0000 (20:55 +0400)]
avformat/http: pass return code from http_open_cnx_internal() on its failure

Previously, AVERROR(EIO) was returned on failure of
http_open_cnx_internal(). Now the value is passed to upper level, thus
it is possible to distinguish ECONNREFUSED, ETIMEDOUT, ENETUNREACH etc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/concatdec: Forward whitelists to the subdemuxers.
Michael Niedermayer [Thu, 23 Oct 2014 14:13:05 +0000 (16:13 +0200)]
avformat/concatdec: Forward whitelists to the subdemuxers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoForward whitelists to the asf demuxer
Michael Niedermayer [Thu, 23 Oct 2014 14:08:51 +0000 (16:08 +0200)]
Forward whitelists to the asf demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Forward whitelists to the subtitle demuxer
Michael Niedermayer [Thu, 23 Oct 2014 14:07:31 +0000 (16:07 +0200)]
avformat/avidec: Forward whitelists to the subtitle demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: Forward whitelists to the mpegps demuxer
Michael Niedermayer [Thu, 23 Oct 2014 14:07:00 +0000 (16:07 +0200)]
avformat/mpeg: Forward whitelists to the mpegps demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/libquvi: Forward whitelists to subdemuxer
Michael Niedermayer [Thu, 23 Oct 2014 14:04:45 +0000 (16:04 +0200)]
avformat/libquvi: Forward whitelists to subdemuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/hpeldsp: fix loop in {avg,avg_no_rnd}_pixels16_x2_mmx
James Almer [Thu, 23 Oct 2014 03:43:43 +0000 (00:43 -0300)]
x86/hpeldsp: fix loop in {avg,avg_no_rnd}_pixels16_x2_mmx

Handle it inside the __asm__() block.
Fixes fate-vc1_ilaced_twomv when using the gcc-usan toolchain.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavformat/sapdec: Forward whitelists to sdp demuxer
Michael Niedermayer [Thu, 23 Oct 2014 13:27:21 +0000 (15:27 +0200)]
avformat/sapdec: Forward whitelists to sdp demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hls: forward whitelists to mpegts demuxer
Michael Niedermayer [Thu, 23 Oct 2014 13:26:46 +0000 (15:26 +0200)]
avformat/hls: forward whitelists to mpegts demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/avstring: fix hardcoded separator in av_match_list()
Michael Niedermayer [Thu, 23 Oct 2014 10:22:21 +0000 (12:22 +0200)]
avutil/avstring: fix hardcoded separator in av_match_list()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/avstring: Reimplement av_match_list()
Michael Niedermayer [Thu, 23 Oct 2014 02:33:57 +0000 (04:33 +0200)]
avutil/avstring: Reimplement av_match_list()

av_match_list() is only used for whitelists, fix it so it works with
multi-named formats like "mov,mp4,m4a,3gp,3g2,mj2"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/format: Use av_match_name() instead of list in av_match_ext()
Michael Niedermayer [Thu, 23 Oct 2014 02:33:09 +0000 (04:33 +0200)]
avformat/format: Use av_match_name() instead of list in av_match_ext()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdded STL demuxer and decoder
Eejya Singh [Mon, 20 Oct 2014 20:25:39 +0000 (01:55 +0530)]
Added STL demuxer and decoder

Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agoffserver_conf: factorize parse function per config tag
Lukasz Marek [Sun, 19 Oct 2014 14:37:16 +0000 (16:37 +0200)]
ffserver_conf: factorize parse function per config tag

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver_config: clean up variable initialization
Lukasz Marek [Sun, 19 Oct 2014 14:59:02 +0000 (16:59 +0200)]
ffserver_config: clean up variable initialization

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver: move configuration code to separate file
Lukasz Marek [Sun, 19 Oct 2014 13:39:06 +0000 (15:39 +0200)]
ffserver: move configuration code to separate file

This commit doesn't change any existing logic.
It moves ffserver configuration related code to separate file.
It intends to make maintaining easier.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/tiffenc: properly compute packet size
Christophe Gisquet [Sun, 12 Oct 2014 19:10:54 +0000 (21:10 +0200)]
avcodec/tiffenc: properly compute packet size

The bytes per row is a better indication of it.

Helps resolving ticket #3874 by fixing ffmpeg's encoder and transforming
the issue in a issue with non-compliant decoders. ffmpeg's one is ok,
but unfortunately, many others aren't handling correctly unusual chroma
samplings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: avoid endlessly reading from one input while another is unavailable
Michael Niedermayer [Wed, 22 Oct 2014 15:08:00 +0000 (17:08 +0200)]
ffmpeg: avoid endlessly reading from one input while another is unavailable

Testcase in Ticket 4051

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: Fix assertion failure due to max_interleave_delta and poor input
Michael Niedermayer [Wed, 22 Oct 2014 14:15:02 +0000 (16:15 +0200)]
avformat/mux: Fix assertion failure due to max_interleave_delta and poor input

Fixes Ticket4051

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_idet: Fixes issue with idet not flushing last frame.
Neil Birkbeck [Wed, 22 Oct 2014 06:40:06 +0000 (23:40 -0700)]
avfilter/vf_idet: Fixes issue with idet not flushing last frame.

Uses a similar approach as vf_yadif to flush the last frame in idet.

Quick test with 50 frames from vsynth1:
./ffmpeg.old -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1  | grep Multi
 (gives) [Parsed_idet_0 @ 0x261ebb0] Multi frame detection: TFF:0 BFF:0 Progressive:48 Undetermined:1

./ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1  | grep Multi
 (gives) [Parsed_idet_0 @ 0x35a0bb0] Multi frame detection: TFF:0 BFF:0 Progressive:49 Undetermined:1

Fate tests have been updated.

(In testing, it seems this filter will also need a subsequent patch for single frame input)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Fix cluster parsing loop which gathers seek information
Michael Niedermayer [Wed, 22 Oct 2014 02:21:39 +0000 (04:21 +0200)]
avformat/matroskadec: Fix cluster parsing loop which gathers seek information

Fixes Ticket2263
Fixes Ticket3934

Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/crypto_bench: add CAST5 support
James Almer [Sat, 18 Oct 2014 21:10:33 +0000 (18:10 -0300)]
tools/crypto_bench: add CAST5 support

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/mjpegdec: use FF_CEIL_RSHIFT() for width
Michael Niedermayer [Wed, 22 Oct 2014 00:28:54 +0000 (02:28 +0200)]
avcodec/mjpegdec: use FF_CEIL_RSHIFT() for width

No testcase known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/cinedec: Fix a typo in the file header.
Carl Eugen Hoyos [Tue, 21 Oct 2014 23:37:02 +0000 (01:37 +0200)]
lavf/cinedec: Fix a typo in the file header.

5 years agoMerge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'
Michael Niedermayer [Tue, 21 Oct 2014 22:17:29 +0000 (00:17 +0200)]
Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'

* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
  nutdec: check av_new_packet return value

Conflicts:
libavformat/nutdec.c

See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
Michael Niedermayer [Tue, 21 Oct 2014 22:09:00 +0000 (00:09 +0200)]
Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'

* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
  nutenc: check for negative index rather than assert

Conflicts:
libavformat/nutenc.c

Not merged, the assert is correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'
Michael Niedermayer [Tue, 21 Oct 2014 21:47:44 +0000 (23:47 +0200)]
Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'

* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
  rmdec: stricter error check to avoid theoretical unitialized use

Conflicts:
libavformat/rmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'
Michael Niedermayer [Tue, 21 Oct 2014 20:48:19 +0000 (22:48 +0200)]
Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'

* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
  rmdec: check av_new_packet return value

Conflicts:
libavformat/rmdec.c

See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/fbdev_common: report error during probing fbdev device
Lukasz Marek [Sat, 18 Oct 2014 18:22:35 +0000 (20:22 +0200)]
lavd/fbdev_common: report error during probing fbdev device

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavd/fbdev_dec: use default device when not provided
Lukasz Marek [Sat, 18 Oct 2014 17:35:47 +0000 (19:35 +0200)]
lavd/fbdev_dec: use default device when not provided

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'
Michael Niedermayer [Tue, 21 Oct 2014 20:35:30 +0000 (22:35 +0200)]
Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'

* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
  flvdec: make sure to check create_stream and report the same error

Conflicts:
libavformat/flvdec.c

See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'
Michael Niedermayer [Tue, 21 Oct 2014 20:06:46 +0000 (22:06 +0200)]
Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'

* commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629':
  flvdec: avoid unitialized use of a struct member

See: 396ddcf22d55fa7e735d69eed22a4a4b1649b73c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'
Michael Niedermayer [Tue, 21 Oct 2014 20:00:04 +0000 (22:00 +0200)]
Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'

* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
libavformat/smoothstreamingenc.c

See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'
Michael Niedermayer [Tue, 21 Oct 2014 19:43:42 +0000 (21:43 +0200)]
Merge commit '04d8af5f17961b9b7076b8c974e360feb08787c2'

* commit '04d8af5f17961b9b7076b8c974e360feb08787c2':
  fate-mpeg4: use TARGET_SAMPLES for resize tests

Conflicts:
tests/fate/mpeg4.mak

See: c40a1bd253f673d821a5df2a7a863a1837446123
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: simplify chroma_height calculation
Michael Niedermayer [Tue, 21 Oct 2014 18:56:17 +0000 (20:56 +0200)]
avcodec/mjpegdec: simplify chroma_height calculation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov.c: reasonable bitrate for fragmented mp4
Mika Raento [Tue, 21 Oct 2014 12:04:10 +0000 (15:04 +0300)]
mov.c: reasonable bitrate for fragmented mp4

If using MFRA for timestamps, the stream may start from a large offset
and/or have gaps. With this change we calculate the bitrate based on
frames we've seen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Support 24111100 pix fmt id
Michael Niedermayer [Tue, 21 Oct 2014 14:41:47 +0000 (16:41 +0200)]
avcodec/mjpegdec: Support 24111100 pix fmt id

Fixes 129533924_640.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agonutdec: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:19 +0000 (14:11 +0100)]
nutdec: check av_new_packet return value

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

5 years agonutenc: check for negative index rather than assert
Vittorio Giovara [Mon, 20 Oct 2014 13:11:20 +0000 (14:11 +0100)]
nutenc: check for negative index rather than assert

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

5 years agormdec: stricter error check to avoid theoretical unitialized use
Vittorio Giovara [Mon, 20 Oct 2014 13:11:16 +0000 (14:11 +0100)]
rmdec: stricter error check to avoid theoretical unitialized use

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

5 years agormdec: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:17 +0000 (14:11 +0100)]
rmdec: check av_new_packet return value

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

5 years agoflvdec: make sure to check create_stream and report the same error
Vittorio Giovara [Mon, 20 Oct 2014 11:56:41 +0000 (12:56 +0100)]
flvdec: make sure to check create_stream and report the same error

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

5 years agoflvdec: avoid unitialized use of a struct member
Vittorio Giovara [Mon, 20 Oct 2014 11:56:42 +0000 (12:56 +0100)]
flvdec: avoid unitialized use of a struct member

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

5 years agosmoothstreamingenc: explict cast to avoid overflow
Vittorio Giovara [Mon, 20 Oct 2014 11:56:40 +0000 (12:56 +0100)]
smoothstreamingenc: explict cast to avoid overflow

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

5 years agodoc/ffmpeg.texi: document the new -start_at_zero option
Rodger Combs [Tue, 21 Oct 2014 06:23:55 +0000 (01:23 -0500)]
doc/ffmpeg.texi: document the new -start_at_zero option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/concat: accept a single segment
Stefano Sabatini [Tue, 21 Oct 2014 09:45:30 +0000 (11:45 +0200)]
lavfi/concat: accept a single segment

Simplify scripting operations, so that n=1 is not to be considered as a
special case.

5 years agolavfi/afade: fix cur_sample computation
Stefano Sabatini [Tue, 21 Oct 2014 09:43:56 +0000 (11:43 +0200)]
lavfi/afade: fix cur_sample computation

Use the correct timebase conversion.

5 years agolavf/mov.c: Prevent memory leak in case of invalid metadata reads.
Thilo Borgmann [Tue, 21 Oct 2014 08:10:55 +0000 (10:10 +0200)]
lavf/mov.c: Prevent memory leak in case of invalid metadata reads.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate-mpeg4: use TARGET_SAMPLES for resize tests
Janne Grunau [Tue, 21 Oct 2014 07:56:23 +0000 (09:56 +0200)]
fate-mpeg4: use TARGET_SAMPLES for resize tests

5 years agoavformat/rtsp: Use ff_rtsp_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:03 +0000 (00:24 +0400)]
avformat/rtsp: Use ff_rtsp_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtspcodes: introduce ff_rtsp_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:02 +0000 (00:24 +0400)]
avformat/rtspcodes: introduce ff_rtsp_averror()

Currently this is another name for ff_http_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: Add -start_at_zero option.
Rodger Combs [Mon, 20 Oct 2014 23:50:12 +0000 (18:50 -0500)]
ffmpeg_opt: Add -start_at_zero option.

This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideodec: print extradata size if unsupported
Michael Niedermayer [Sun, 19 Oct 2014 12:33:20 +0000 (14:33 +0200)]
avcodec/libutvideodec: print extradata size if unsupported

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'
Michael Niedermayer [Mon, 20 Oct 2014 21:03:36 +0000 (23:03 +0200)]
Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'

* commit 'd2771a1dc0a3695e8873adc16d068077f2417eea':
  rtpproto: Free the addrinfo pointer on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'
Michael Niedermayer [Mon, 20 Oct 2014 20:35:15 +0000 (22:35 +0200)]
Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'

* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
  nutdec: Prevent a memory corruption

Conflicts:
libavformat/nutdec.c

See: 05dd5368a92718f3a25f97f4697acffbabc7458f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'
Michael Niedermayer [Mon, 20 Oct 2014 20:24:37 +0000 (22:24 +0200)]
Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'

* commit '350ed1829268d343b791208c8fd1cddd44d52a8e':
  rtpdec_hevc: drop unnecessary check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '322b571d5591978efd6f6fee12181ac8900079fe'
Michael Niedermayer [Mon, 20 Oct 2014 20:08:04 +0000 (22:08 +0200)]
Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'

* commit '322b571d5591978efd6f6fee12181ac8900079fe':
  rtmpproto: remove dead code

See: 3a8b66af6cf6af9da5ff97a5930d10a7a4568558
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'
Michael Niedermayer [Mon, 20 Oct 2014 19:59:24 +0000 (21:59 +0200)]
Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

See: ee16e0cacc16ea60c35a66796410012755263c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd: export all symbols with av_ prefix
Lukasz Marek [Mon, 20 Oct 2014 10:12:20 +0000 (12:12 +0200)]
lavd: export all symbols with av_ prefix

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'
Michael Niedermayer [Mon, 20 Oct 2014 19:52:12 +0000 (21:52 +0200)]
Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'

* commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2':
  wtv: clean memory on error

See: e47024d72f326f7a76c9df90da861663fc5d5fc2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'
Michael Niedermayer [Mon, 20 Oct 2014 19:42:45 +0000 (21:42 +0200)]
Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'

* commit '9fbc613f0df1628e7e78bca791fa8833846f8210':
  wtv: check seek_by_sector return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'
Michael Niedermayer [Mon, 20 Oct 2014 19:23:41 +0000 (21:23 +0200)]
Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'

* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
  aviobuf: check context before using it

See: 7441d1ec330da810a0ffd44a02b2fc60add5b719
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'
Michael Niedermayer [Mon, 20 Oct 2014 19:16:20 +0000 (21:16 +0200)]
Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'

* commit '02484d1a9316a9309fc1830825345ab79f6a8d60':
  avio: fix sizeof argument

See: a96577df38469e5075caa416d3374576d9ab64ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'
Michael Niedermayer [Mon, 20 Oct 2014 18:58:03 +0000 (20:58 +0200)]
Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'

* commit '8ab3b71e4b343cec3fa369a880ab4496d7345154':
  idcin: fix return check

See: ee884c30233856b69fb87345944b4cdfe666fc0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabl...
Rong Yan [Mon, 13 Oct 2014 06:40:30 +0000 (06:40 +0000)]
configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/mov.c: Allocate buffer in case of long metadata entries.
Thilo Borgmann [Mon, 20 Oct 2014 11:42:28 +0000 (13:42 +0200)]
lavf/mov.c: Allocate buffer in case of long metadata entries.

Fixes ticket #4018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agov4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD
Brad Smith [Mon, 20 Oct 2014 04:09:55 +0000 (00:09 -0400)]
v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD

Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_idet: add both multiple and single frame detection metadata
Kevin Mitchell [Sun, 19 Oct 2014 20:32:56 +0000 (13:32 -0700)]
avfilter/vf_idet: add both multiple and single frame detection metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortpproto: Free the addrinfo pointer on failure
Luca Barbato [Sat, 18 Oct 2014 15:58:41 +0000 (16:58 +0100)]
rtpproto: Free the addrinfo pointer on failure

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

5 years agonutdec: Prevent a memory corruption
Luca Barbato [Sat, 18 Oct 2014 15:58:47 +0000 (16:58 +0100)]
nutdec: Prevent a memory corruption

Chapters do not have an event_flags field.

Bug-Id: CID 1231990

5 years agortpdec_hevc: drop unnecessary check
Vittorio Giovara [Sat, 18 Oct 2014 15:58:42 +0000 (16:58 +0100)]
rtpdec_hevc: drop unnecessary check

len is always >=1 in that case.

Bug-Id: CID 1238784

5 years agortmpproto: remove dead code
Vittorio Giovara [Sat, 18 Oct 2014 15:58:44 +0000 (16:58 +0100)]
rtmpproto: remove dead code

Expression already evaluated before, redundant since
053386864219eccbcca1886c55f902f9555428a5.

Bug-Id: CID 732199

5 years agovf_format: check input validity
Vittorio Giovara [Sat, 18 Oct 2014 15:10:35 +0000 (16:10 +0100)]
vf_format: check input validity

CC: libav-stable@libav.org
5 years agowtv: clean memory on error
Vittorio Giovara [Sat, 18 Oct 2014 00:12:18 +0000 (01:12 +0100)]
wtv: clean memory on error

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

5 years agowtv: check seek_by_sector return value
Vittorio Giovara [Sat, 18 Oct 2014 00:12:19 +0000 (01:12 +0100)]
wtv: check seek_by_sector return value

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

5 years agoaviobuf: check context before using it
Vittorio Giovara [Sat, 18 Oct 2014 00:12:13 +0000 (01:12 +0100)]
aviobuf: check context before using it

Avoid a possible null pointer dereference.

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

5 years agoavio: fix sizeof argument
Michael Niedermayer [Sat, 18 Oct 2014 00:12:12 +0000 (01:12 +0100)]
avio: fix sizeof argument

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

5 years agoidcin: fix return check
Vittorio Giovara [Sat, 18 Oct 2014 00:12:11 +0000 (01:12 +0100)]
idcin: fix return check

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

5 years agoavutil/cast5: Fix off by one error
Michael Niedermayer [Mon, 20 Oct 2014 03:41:26 +0000 (05:41 +0200)]
avutil/cast5: Fix off by one error

Fixes fate-cast5 on alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: Use ff_http_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:01 +0000 (00:24 +0400)]
avformat/http: Use ff_http_averror()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: Introduce ff_http_averror()
Andrey Utkin [Fri, 17 Oct 2014 20:24:00 +0000 (00:24 +0400)]
avformat/http: Introduce ff_http_averror()

int ff_http_averror(int status_code, int default_averror)

This helper function returns AVERROR_ value from 3-digit HTTP status
code.

Second argument, default_averror, is used if no specific AVERROR_ is
available. It is introduced because in different places of code
different return codes are used - -1, AVERROR(EIO), AVERROR_INVALIDDATA.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: remove redundant FF_MPV_OFFSET()
Michael Niedermayer [Mon, 20 Oct 2014 02:09:43 +0000 (04:09 +0200)]
avcodec/snowenc: remove redundant FF_MPV_OFFSET()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ass: add ASS trailing \r\n in one single place
Clément Bœsch [Sun, 19 Oct 2014 19:19:07 +0000 (21:19 +0200)]
avcodec/ass: add ASS trailing \r\n in one single place

5 years agoavcodec/ass: assume raw=0 in ff_ass_add_rect_bprint
Clément Bœsch [Sun, 19 Oct 2014 19:03:57 +0000 (21:03 +0200)]
avcodec/ass: assume raw=0 in ff_ass_add_rect_bprint

5 years agoavutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers
Andrey Utkin [Fri, 17 Oct 2014 20:23:59 +0000 (00:23 +0400)]
avutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffprobe: Add support for color_trc/color_pri/chroma_loc
Michael Niedermayer [Fri, 10 Oct 2014 02:36:03 +0000 (04:36 +0200)]
ffprobe: Add support for color_trc/color_pri/chroma_loc

Idea from: a2c00d22e71d13b72828147be86aa9e961c6cae6
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agortmpproto: Don't mistake app for playpath.
Kacper Michajłow [Sun, 19 Oct 2014 16:16:17 +0000 (18:16 +0200)]
rtmpproto: Don't mistake app for playpath.

For URLs "rtmp://server[:port]/foo" determine what `foo` refers to. If
application name has been defined by the user assume that `foo` is a
playpath, otherwise assume application name.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavfi: added option to vf_perspective to specify transformation by giving destinati...
Nicholas Robbins [Sun, 19 Oct 2014 13:20:22 +0000 (09:20 -0400)]
libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source.

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_idet: add counts to frame metadata
Kevin Mitchell [Sun, 19 Oct 2014 11:11:25 +0000 (04:11 -0700)]
avfilter/vf_idet: add counts to frame metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/riff: Add UGY2
Michael Niedermayer [Sun, 19 Oct 2014 12:34:50 +0000 (14:34 +0200)]
avformat/riff: Add UGY2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: fix localtime drawtext example.
Simon Thelen [Tue, 9 Sep 2014 22:01:19 +0000 (00:01 +0200)]
doc/filters: fix localtime drawtext example.

The colon after the localtime function call needs an additional layer of
escaping or else everything until the next colon is treated as a
fontfile.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: Add format_whitelist
Michael Niedermayer [Tue, 30 Sep 2014 21:25:39 +0000 (23:25 +0200)]
avformat: Add format_whitelist

This allows restricting demuxers to a list of needed ones for improved security
Note, some demuxers themselfs open other demuxers, these are only restricted if
AVOptions are forwarded to them. Please check that your code does that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: add codec_whitelist
Michael Niedermayer [Tue, 30 Sep 2014 21:24:52 +0000 (23:24 +0200)]
avcodec: add codec_whitelist

This allows restricting decoders to a list of needed ones for improved security

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Display pixel format information as none ... if unknown instead of...
Michael Niedermayer [Fri, 10 Oct 2014 01:16:50 +0000 (03:16 +0200)]
avcodec/utils: Display pixel format information as none ... if unknown instead of omitting it

This is similar to 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8

The difference this change makes affects only rather few files
but looks like:
Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc
vs.
Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libvpxenc: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 19 Oct 2014 01:03:04 +0000 (03:03 +0200)]
avcodec/libvpxenc: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 19 Oct 2014 01:03:04 +0000 (03:03 +0200)]
avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sun, 19 Oct 2014 01:03:04 +0000 (03:03 +0200)]
avcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'
Michael Niedermayer [Sat, 18 Oct 2014 21:48:02 +0000 (23:48 +0200)]
Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'

* commit '0034314a69e76a53534a74cceef865cfcb7b42cc':
  rtmp: Always call rtmp_close() on rtmp_open() failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
Michael Niedermayer [Sat, 18 Oct 2014 21:39:56 +0000 (23:39 +0200)]
Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'

* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
libswscale/rgb2rgb_template.c

See: a07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5
See: a30972609ca39b791ce1e4e5cc6c3dd6cb9c9b12
Merged-by: Michael Niedermayer <michaelni@gmx.at>