ffmpeg.git
7 years agolavd/pulse_audio_enc: fix flush return code
Lukasz Marek [Fri, 1 Nov 2013 14:10:56 +0000 (15:10 +0100)]
lavd/pulse_audio_enc: fix flush return code

Successful flushing is reported by returning 1 instead of 0.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
7 years agohttp: add hack to make streams served by MediaGateway not seekable
wm4 [Sun, 3 Nov 2013 17:17:45 +0000 (18:17 +0100)]
http: add hack to make streams served by MediaGateway not seekable

These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:

    content-range: bytes 0-1999999999/2000000000

Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:

    Server: MediaGateway 3.5.2-001

Add a hack that checks the server name, and disables seeking in this
case.

Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ffv1enc: Check high bpp RGB against coder type too
Michael Niedermayer [Sun, 3 Nov 2013 21:11:11 +0000 (22:11 +0100)]
avcodec/ffv1enc: Check high bpp RGB against coder type too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/utils: never decrease has_b_frames in compute_pkt_fields()
Michael Niedermayer [Sun, 3 Nov 2013 20:26:40 +0000 (21:26 +0100)]
avformat/utils: never decrease has_b_frames in compute_pkt_fields()

The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/x86/hpeldsp: fix crash on AMD K6-3+
Mikulas Patocka [Sun, 3 Nov 2013 17:00:17 +0000 (18:00 +0100)]
avcodec/x86/hpeldsp: fix crash on AMD K6-3+

There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.

livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.

As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.

This bug seems to be introduced by commit
71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"

Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: add verbose consistency checks in case of filtering inconsistent options
Stefano Sabatini [Sun, 3 Nov 2013 09:50:16 +0000 (10:50 +0100)]
ffmpeg: add verbose consistency checks in case of filtering inconsistent options

In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678.

7 years agolavc: remove dead FF_API_OLD_TIMECODE API
Stefano Sabatini [Sun, 3 Nov 2013 12:36:24 +0000 (13:36 +0100)]
lavc: remove dead FF_API_OLD_TIMECODE API

7 years agolavc: remove dead FF_API_AVCODEC_OPEN API
Stefano Sabatini [Sun, 3 Nov 2013 12:34:08 +0000 (13:34 +0100)]
lavc: remove dead FF_API_AVCODEC_OPEN API

7 years agolavc: remove dead FF_API_ALLOC_CONTEXT API
Stefano Sabatini [Sun, 3 Nov 2013 12:32:34 +0000 (13:32 +0100)]
lavc: remove dead FF_API_ALLOC_CONTEXT API

7 years agoavfilter/vf_aspect: remove dupe constants setup
Paul B Mahol [Sun, 3 Nov 2013 16:39:22 +0000 (16:39 +0000)]
avfilter/vf_aspect: remove dupe constants setup

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMAINTAINERS: add vp9 maintainers
Michael Niedermayer [Sun, 3 Nov 2013 13:45:18 +0000 (14:45 +0100)]
MAINTAINERS: add vp9 maintainers

Suggested-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 3 Nov 2013 12:57:01 +0000 (13:57 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/af_pan: support unknown layouts on input.
  lavfi/af_pan: support unknown layouts on output.
  lswr: fix assert failure on unknown layouts.
  lavfi: parsing helper for unknown channel layouts.
  lavfi/avfiltergraph: do not reduce incompatible lists.
  lavfi/avfiltergraph: suggest a solution when format selection fails.
  lavd/lavfi: support unknown channel layouts.
  lavf/wavenc: check for a single stream.
  lavd/alsa: add stream validation
  lavd/alsa: fix timestamp calculation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 3 Nov 2013 12:07:42 +0000 (13:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmpproto: Reorder conditions to help dead code elimination

See: 23e9e5c7d9048cb463c4de9e518994aa5d651445
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/version.h: remove empty line
Stefano Sabatini [Sun, 3 Nov 2013 12:12:58 +0000 (13:12 +0100)]
lavc/version.h: remove empty line

7 years agolavc: drop deprecated audio_convert API at the next major bump
Stefano Sabatini [Thu, 31 Oct 2013 09:38:10 +0000 (10:38 +0100)]
lavc: drop deprecated audio_convert API at the next major bump

Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoavcodec/ansi: set w/h correctly at the top
Michael Niedermayer [Sun, 3 Nov 2013 12:00:10 +0000 (13:00 +0100)]
avcodec/ansi: set w/h correctly at the top

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
Michael Niedermayer [Sun, 3 Nov 2013 11:58:54 +0000 (12:58 +0100)]
Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'

* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
  ansi: fix possible use of uninitialized variables

Conflicts:
libavcodec/ansi.c

Only partially merged, ffmpeg is not affected by this.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'
Michael Niedermayer [Sun, 3 Nov 2013 11:48:04 +0000 (12:48 +0100)]
Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'

* commit 'c0bba95c2363641d3297b3852b2ece1474cda295':
  wtv: fix variable sign in format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'
Michael Niedermayer [Sun, 3 Nov 2013 11:37:54 +0000 (12:37 +0100)]
Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'

* commit '5858a67f135a7395c548482c73cf3d39bcdd3022':
  attributes: disable flatten on llvm/clang

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '3a14b160bd442794c6a16a6a883adb547550e847'
Michael Niedermayer [Sun, 3 Nov 2013 11:23:01 +0000 (12:23 +0100)]
Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'

* commit '3a14b160bd442794c6a16a6a883adb547550e847':
  vf_scale: make the dar variable return the DAR.

Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h

See: 61d55fda2b513caf18e37b27aba680a87840904a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
Michael Niedermayer [Sun, 3 Nov 2013 10:36:16 +0000 (11:36 +0100)]
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'

* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmpproto: Reorder conditions to help dead code elimination
Vittorio Giovara [Sun, 3 Nov 2013 09:50:00 +0000 (10:50 +0100)]
rtmpproto: Reorder conditions to help dead code elimination

This makes sure that these branches are eliminated properly
with clang with optimizations disabled.

7 years agoansi: fix possible use of uninitialized variables
Vittorio Giovara [Sun, 27 Oct 2013 17:14:02 +0000 (18:14 +0100)]
ansi: fix possible use of uninitialized variables

7 years agowtv: fix variable sign in format
Vittorio Giovara [Sun, 27 Oct 2013 17:05:19 +0000 (18:05 +0100)]
wtv: fix variable sign in format

7 years agoattributes: disable flatten on llvm/clang
Vittorio Giovara [Sat, 26 Oct 2013 23:45:18 +0000 (01:45 +0200)]
attributes: disable flatten on llvm/clang

7 years agolavfi/af_pan: support unknown layouts on input.
Nicolas George [Fri, 25 Oct 2013 14:12:06 +0000 (16:12 +0200)]
lavfi/af_pan: support unknown layouts on input.

Fix trac ticket #2899.

7 years agolavfi/af_pan: support unknown layouts on output.
Nicolas George [Fri, 25 Oct 2013 14:02:04 +0000 (16:02 +0200)]
lavfi/af_pan: support unknown layouts on output.

7 years agolswr: fix assert failure on unknown layouts.
Nicolas George [Fri, 25 Oct 2013 14:11:30 +0000 (16:11 +0200)]
lswr: fix assert failure on unknown layouts.

7 years agolavfi: parsing helper for unknown channel layouts.
Nicolas George [Fri, 25 Oct 2013 13:07:40 +0000 (15:07 +0200)]
lavfi: parsing helper for unknown channel layouts.

Make ff_parse_channel_layout() accept unknown layouts too.

7 years agolavfi/avfiltergraph: do not reduce incompatible lists.
Nicolas George [Tue, 3 Sep 2013 20:13:49 +0000 (22:13 +0200)]
lavfi/avfiltergraph: do not reduce incompatible lists.

A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.

7 years agolavfi/avfiltergraph: suggest a solution when format selection fails.
Nicolas George [Tue, 3 Sep 2013 20:12:54 +0000 (22:12 +0200)]
lavfi/avfiltergraph: suggest a solution when format selection fails.

Format selection can fail if unknown channel layouts are used
with filters that do not support it.

7 years agolavd/lavfi: support unknown channel layouts.
Nicolas George [Mon, 28 Oct 2013 10:50:09 +0000 (11:50 +0100)]
lavd/lavfi: support unknown channel layouts.

7 years agolavf/wavenc: check for a single stream.
Nicolas George [Sat, 2 Nov 2013 15:23:26 +0000 (16:23 +0100)]
lavf/wavenc: check for a single stream.

Fix trac ticket #3110.

7 years agolavd/alsa: add stream validation
Lukasz Marek [Fri, 25 Oct 2013 23:32:55 +0000 (01:32 +0200)]
lavd/alsa: add stream validation

Don't trust provided streams.
Return with error when stream count is not 1 or
provided stream is not an audio stream.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
7 years agolavd/alsa: fix timestamp calculation
Lukasz Marek [Fri, 25 Oct 2013 23:19:31 +0000 (01:19 +0200)]
lavd/alsa: fix timestamp calculation

Current implementation didn't include duration of
last processed packet.
Device may return negative timestamps without
this correction.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
7 years agoavcodec/hevc_sei: Fix null dereference in decode_pic_timing()
Michael Niedermayer [Sun, 3 Nov 2013 00:53:19 +0000 (01:53 +0100)]
avcodec/hevc_sei: Fix null dereference in decode_pic_timing()

Fixes Ticket3106

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc_sei: check active_seq_parameter_set_id validity
Michael Niedermayer [Sun, 3 Nov 2013 01:07:31 +0000 (02:07 +0100)]
avcodec/hevc_sei: check active_seq_parameter_set_id validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: reduce whitespace differences to libav
Michael Niedermayer [Sun, 3 Nov 2013 00:07:07 +0000 (01:07 +0100)]
mpegvideo: reduce whitespace differences to libav

This excludes many changes that worsen readability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: reduce whitespace differences to libav
Michael Niedermayer [Sun, 3 Nov 2013 00:07:07 +0000 (01:07 +0100)]
h264: reduce whitespace differences to libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvpxenc: allow qmax of 0
James Zern [Sat, 2 Nov 2013 23:28:56 +0000 (00:28 +0100)]
libvpxenc: allow qmax of 0

this is valid for both vp8 & vp9 and necessary for lossless in the
latter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/xtea: add Doxy @file and group
Timothy Gu [Sat, 2 Nov 2013 22:03:30 +0000 (15:03 -0700)]
avutil/xtea: add Doxy @file and group

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/adler32: add Doxy group
Timothy Gu [Sat, 2 Nov 2013 22:03:15 +0000 (15:03 -0700)]
avutil/adler32: add Doxy group

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvpxenc: add VP9 options
James Zern [Sat, 2 Nov 2013 23:20:19 +0000 (00:20 +0100)]
libvpxenc: add VP9 options

same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: add myself for libvpx*
James Zern [Sat, 2 Nov 2013 23:28:18 +0000 (00:28 +0100)]
MAINTAINERS: add myself for libvpx*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: store 2pass statistics at the end
Michael Niedermayer [Sat, 2 Nov 2013 21:27:32 +0000 (22:27 +0100)]
ffv1enc: store 2pass statistics at the end

This reduces their size from O(n) to O(1)

Fixes Ticket3078

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/ffv1enc: pass through pts
Michael Niedermayer [Sat, 2 Nov 2013 21:52:19 +0000 (22:52 +0100)]
avcodec/ffv1enc: pass through pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_scale: make the dar variable return the DAR.
Rudolf Polzer [Sat, 2 Nov 2013 10:57:25 +0000 (11:57 +0100)]
vf_scale: make the dar variable return the DAR.

Before, it just returned width/height. Correct is width/height*sar.

That way it is consistent with DAR as in probe output and setdar.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agovf_aspect: support variables in evaluating the aspect ratios
Rudolf Polzer [Sat, 2 Nov 2013 10:57:24 +0000 (11:57 +0100)]
vf_aspect: support variables in evaluating the aspect ratios

Example: -vf setsar=sar="sar*9/10"

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agolibvpxenc: split vp8/vp9 options array
James Zern [Sat, 2 Nov 2013 19:09:01 +0000 (20:09 +0100)]
libvpxenc: split vp8/vp9 options array

the current options are left for both to provide command line compatibility

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/libmp3lame: add ABR support
Timothy Gu [Sat, 2 Nov 2013 02:43:24 +0000 (19:43 -0700)]
avcodec/libmp3lame: add ABR support

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 2 Nov 2013 17:37:14 +0000 (18:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  os_support: Add #endif comments for better readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'
Michael Niedermayer [Sat, 2 Nov 2013 17:31:41 +0000 (18:31 +0100)]
Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'

* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381e1e7790f21...
Michael Niedermayer [Sat, 2 Nov 2013 14:47:48 +0000 (15:47 +0100)]
avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea0...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea0...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381e1e7790f21b0199a...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381e1e7790f21b...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevc: indention related cosmetics to reduce diff to 064698d381e1e7790f21b0...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: indention related cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381e1e7790f21b0199a89...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavcodec/hevc: reduce whitespace differences to 064698d381e1e7790f21b0199a8930ea04e...
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: reduce whitespace differences to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoos_support: Add #endif comments for better readability
Diego Biurrun [Sat, 2 Nov 2013 11:00:42 +0000 (12:00 +0100)]
os_support: Add #endif comments for better readability

7 years agolibavcodec/hevc: reduce bracket differences to 064698d381e1e7790f21b0199a8930ea04e2e942
Michael Niedermayer [Sat, 2 Nov 2013 10:59:02 +0000 (11:59 +0100)]
libavcodec/hevc: reduce bracket differences to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc: more whitespaces to reduce difference to 064698d381e1e7790f21b0199a8930...
Michael Niedermayer [Sat, 2 Nov 2013 10:43:43 +0000 (11:43 +0100)]
avcodec/hevc: more whitespaces to reduce difference to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4video_parser: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:31:10 +0000 (18:31 +0100)]
mpeg4video_parser: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 2 Nov 2013 09:37:03 +0000 (10:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
Michael Niedermayer [Sat, 2 Nov 2013 09:30:30 +0000 (10:30 +0100)]
Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'

* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '037fea388e0df2a22441bc1ed86794152161baf1'
Michael Niedermayer [Sat, 2 Nov 2013 09:19:12 +0000 (10:19 +0100)]
Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'

* commit '037fea388e0df2a22441bc1ed86794152161baf1':
  flashsv: K&R formatting cosmetics

Conflicts:
libavcodec/flashsv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1700b4e678ed329611a16b20d11e64b7abda4839'
Michael Niedermayer [Sat, 2 Nov 2013 09:11:35 +0000 (10:11 +0100)]
Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'

* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
  x86: vp8dsp: Split loopfilter code into a separate file

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'
Michael Niedermayer [Sat, 2 Nov 2013 09:02:12 +0000 (10:02 +0100)]
Merge commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f'

* commit '056fd4fe65e70b4dbca97bcf7faf8b7ce3df993f':
  configure: Properly check for availability of -Wno-foo warning flags

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '23157d72b565e0228fec97f1eb059d4f8021a260'
Michael Niedermayer [Sat, 2 Nov 2013 08:55:40 +0000 (09:55 +0100)]
Merge commit '23157d72b565e0228fec97f1eb059d4f8021a260'

* commit '23157d72b565e0228fec97f1eb059d4f8021a260':
  configure: Split test_cflags function off from check_cflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd an HDS live fragmenting muxer
Martin Storsjö [Thu, 15 Aug 2013 13:06:52 +0000 (16:06 +0300)]
Add an HDS live fragmenting muxer

HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
Michael Niedermayer [Sat, 2 Nov 2013 08:48:34 +0000 (09:48 +0100)]
Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'

* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
  lavf: do not use int to store an int64

Conflicts:
libavformat/utils.c

See: ad56535dd1d7204ea0958decac15e8dfc86162ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
Michael Niedermayer [Sat, 2 Nov 2013 08:39:51 +0000 (09:39 +0100)]
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'

* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
  flashsv: Check diff_start diff_height values

Conflicts:
libavcodec/flashsv.c

See: 880c73cd76109697447fbfbaa8e5ee5683309446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4a64e67988dd01005efb1ae831bff14c1656b573'
Michael Niedermayer [Sat, 2 Nov 2013 08:31:50 +0000 (09:31 +0100)]
Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573'

* commit '4a64e67988dd01005efb1ae831bff14c1656b573':
  flashsv: Refactor a little

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_refs: use named constant for setting frame_recovered
Michael Niedermayer [Sat, 2 Nov 2013 01:37:29 +0000 (02:37 +0100)]
h264_refs: use named constant for setting frame_recovered

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: factor "if(h->sei_recovery_frame_cnt >= 0)" out
Michael Niedermayer [Sat, 2 Nov 2013 00:02:21 +0000 (01:02 +0100)]
h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/hevc: Adjust white-spaces to reduce difference to 064698d381e1e7790f21b0199a8...
Michael Niedermayer [Fri, 1 Nov 2013 23:31:49 +0000 (00:31 +0100)]
avcodec/hevc: Adjust white-spaces to reduce difference to 064698d381e1e7790f21b0199a8930ea04e2e942

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8)
Mickaël Raulet [Thu, 31 Oct 2013 22:51:08 +0000 (23:51 +0100)]
hevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4video: K&R formatting cosmetics
Vittorio Giovara [Mon, 28 Oct 2013 17:31:07 +0000 (18:31 +0100)]
mpeg4video: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoflashsv: K&R formatting cosmetics
Luca Barbato [Thu, 31 Oct 2013 09:27:02 +0000 (10:27 +0100)]
flashsv: K&R formatting cosmetics

Also improve some log message wording/spelling.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86: vp8dsp: Split loopfilter code into a separate file
Diego Biurrun [Tue, 29 Oct 2013 13:45:48 +0000 (14:45 +0100)]
x86: vp8dsp: Split loopfilter code into a separate file

7 years agoconfigure: Properly check for availability of -Wno-foo warning flags
Diego Biurrun [Thu, 31 Oct 2013 19:14:37 +0000 (20:14 +0100)]
configure: Properly check for availability of -Wno-foo warning flags

For some weird reason gcc does not check if the -Wno disabling variants
of warning flags match existing warning flags. Instead it swallows them
silently. That is, unless other warning or error messages are generated,
because then - for some even more bizarre reason - a complaint about the
unknown disable warning flag is issued along with the error or warning
message.

Thus to check for the availability of a warning disabling option, one
needs to check for the enabling variant instead and then add the
disabling variant to CFLAGS.

7 years agoconfigure: Split test_cflags function off from check_cflags
Diego Biurrun [Thu, 31 Oct 2013 18:48:59 +0000 (19:48 +0100)]
configure: Split test_cflags function off from check_cflags

This is useful to test flags without directly adding them to CFLAGS.

7 years agolavf: do not use int to store an int64
Anton Khirnov [Thu, 31 Oct 2013 21:40:33 +0000 (22:40 +0100)]
lavf: do not use int to store an int64

7 years agoavcodec/mvcdec: stop using deprecated avcodec_set_dimensions()
Paul B Mahol [Fri, 1 Nov 2013 19:03:32 +0000 (19:03 +0000)]
avcodec/mvcdec: stop using deprecated avcodec_set_dimensions()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/exr: stop using deprecated avcodec_set_dimensions()
Paul B Mahol [Fri, 1 Nov 2013 15:29:20 +0000 (15:29 +0000)]
avcodec/exr: stop using deprecated avcodec_set_dimensions()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/sanm: stop using deprecated avcodec_set_dimensions()
Paul B Mahol [Fri, 1 Nov 2013 15:26:38 +0000 (15:26 +0000)]
avcodec/sanm: stop using deprecated avcodec_set_dimensions()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()
Michael Niedermayer [Thu, 31 Oct 2013 22:29:01 +0000 (23:29 +0100)]
avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()

Fixes Ticket3103

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/isom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
avformat/isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 1 Nov 2013 18:40:08 +0000 (19:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtspenc: Make sure BYE packets are sent before TEARDOWN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashsv: Check diff_start diff_height values
Michael Niedermayer [Tue, 20 Aug 2013 21:18:48 +0000 (23:18 +0200)]
flashsv: Check diff_start diff_height values

Fix out of array accesses.

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashsv: Refactor a little
Luca Barbato [Tue, 29 Oct 2013 16:02:42 +0000 (17:02 +0100)]
flashsv: Refactor a little

7 years agoMerge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
Michael Niedermayer [Fri, 1 Nov 2013 18:34:19 +0000 (19:34 +0100)]
Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'

* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
  rtpenc: Add a rtpflag option for sending BYE packets when finishing

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b264453de93999ea6f23e98014390af468f56146'
Michael Niedermayer [Fri, 1 Nov 2013 18:33:03 +0000 (19:33 +0100)]
Merge commit 'b264453de93999ea6f23e98014390af468f56146'

* commit 'b264453de93999ea6f23e98014390af468f56146':
  rtpenc: Remove some superfluous parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'
Michael Niedermayer [Fri, 1 Nov 2013 18:28:14 +0000 (19:28 +0100)]
Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'

* commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4':
  aviobuf: Handle a NULL buffer in avio_close_dyn_buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '28240a60c1b5ce276e947ba013271ec009adc078'
Michael Niedermayer [Fri, 1 Nov 2013 18:19:58 +0000 (19:19 +0100)]
Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

* commit '28240a60c1b5ce276e947ba013271ec009adc078':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'
Michael Niedermayer [Fri, 1 Nov 2013 18:11:52 +0000 (19:11 +0100)]
Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'

* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0300962b76644f145b773439989a5cdf1667e162'
Michael Niedermayer [Fri, 1 Nov 2013 18:03:04 +0000 (19:03 +0100)]
Merge commit '0300962b76644f145b773439989a5cdf1667e162'

* commit '0300962b76644f145b773439989a5cdf1667e162':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used...
Michael Niedermayer [Fri, 1 Nov 2013 17:53:01 +0000 (18:53 +0100)]
avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions

This preempts ABI issues if their values get reused by the fork for something unrelated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'
Michael Niedermayer [Fri, 1 Nov 2013 17:47:47 +0000 (18:47 +0100)]
Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'

* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine

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