ffmpeg.git
5 years agolavd/avdevice: always free detected devices on error
Lukasz Marek [Tue, 4 Mar 2014 01:57:27 +0000 (02:57 +0100)]
lavd/avdevice: always free detected devices on error

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavf/http: return error from seek on invalid whence
Lukasz Marek [Thu, 27 Feb 2014 23:36:07 +0000 (00:36 +0100)]
lavf/http: return error from seek on invalid whence

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavf/http: return error on seeking to negative postion
Lukasz Marek [Thu, 27 Feb 2014 23:36:06 +0000 (00:36 +0100)]
lavf/http: return error on seeking to negative postion

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavf/avio: fix ffurl_alloc error checks
Lukasz Marek [Fri, 28 Feb 2014 00:12:07 +0000 (01:12 +0100)]
lavf/avio: fix ffurl_alloc error checks

ffurl_alloc doc says it returns >= 0 in case of success.
avio treats non-zero as errors.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoFix pthread-related compile errors in iec61883.c
Andrey Myznikov [Wed, 5 Mar 2014 16:21:07 +0000 (18:21 +0200)]
Fix pthread-related compile errors in iec61883.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7 / 728c465 - lavc...
Michael Niedermayer [Wed, 5 Mar 2014 21:02:09 +0000 (22:02 +0100)]
doc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7 / 728c465 - lavc 55.26.0 - vdpau.h"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Mar 2014 20:34:08 +0000 (21:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
Michael Niedermayer [Wed, 5 Mar 2014 20:26:11 +0000 (21:26 +0100)]
Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'

* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsevorbis: dont use invalid granules
Michael Niedermayer [Wed, 5 Mar 2014 16:07:28 +0000 (17:07 +0100)]
avformat/oggparsevorbis: dont use invalid granules

Fixes Ticket3437

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output
Jason Hsu [Tue, 4 Mar 2014 07:11:57 +0000 (15:11 +0800)]
doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: hpeldsp: prevent overreads in armv6 asm
Janne Grunau [Wed, 5 Mar 2014 11:44:57 +0000 (12:44 +0100)]
arm: hpeldsp: prevent overreads in armv6 asm

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Bug-Id: 646
CC: libav-stable@libav.org
5 years agoavcodec/ra144enc: avoid calling emms when the SSE2 version is used
Michael Niedermayer [Wed, 5 Mar 2014 13:17:55 +0000 (14:17 +0100)]
avcodec/ra144enc: avoid calling emms when the SSE2 version is used

emms is a rather slow operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agora144enc: fix use of scalarprod_int16
Christophe Gisquet [Wed, 5 Mar 2014 12:00:23 +0000 (13:00 +0100)]
ra144enc: fix use of scalarprod_int16

c3390fd56cf55259ea7665ecea6c8aeddf56e2fc made use of the DSP function
but did not complement it with a call to emms, which is done here before
computations involving floats are performed.

Fixes ticket #3429, which affected MMX/MMXExt machines.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Mar 2014 12:51:09 +0000 (13:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'
Michael Niedermayer [Wed, 5 Mar 2014 12:44:42 +0000 (13:44 +0100)]
Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'

* commit '5ddc9f5052316608799b932c604f9e7561f8ce24':
  configure: enable PIC on s390(x)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: cabac: Use correct #includes to make header compile standalone
Diego Biurrun [Tue, 4 Mar 2014 18:26:28 +0000 (19:26 +0100)]
x86: cabac: Use correct #includes to make header compile standalone

5 years agoMerge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'
Michael Niedermayer [Wed, 5 Mar 2014 10:48:39 +0000 (11:48 +0100)]
Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'

* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
  av_vdpau_get_profile: mask out H.264 intra profile flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: Add missing emms_c when needed
Luca Barbato [Wed, 5 Mar 2014 09:41:33 +0000 (10:41 +0100)]
avfilter: Add missing emms_c when needed

Arch specific calls should have an emms_c following to keep the cpu
state consistent.

Reported-By: wm4
CC: libav-stable@libav.org
5 years agoconfigure: enable PIC on s390(x)
Reinhard Tartler [Sun, 2 Mar 2014 07:11:05 +0000 (02:11 -0500)]
configure: enable PIC on s390(x)

The s390 architecture requires shared libraries to be built in PIC mode.
Otherwise applications will get wrong relocations at run-time, leading
to confusing segmentation faults.

CC: libav-stable@libav.org
5 years agompegts: use goto out instead of break on truncated or invalid pmt tables
Marton Balint [Sun, 2 Mar 2014 17:34:48 +0000 (18:34 +0100)]
mpegts: use goto out instead of break on truncated or invalid pmt tables

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/synth_filter: add synth_filter_fma3
James Almer [Sat, 1 Mar 2014 18:26:51 +0000 (15:26 -0300)]
x86/synth_filter: add synth_filter_fma3

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd "prefer_tcp" flag to "rtsp_flags"
Andrey Utkin [Tue, 4 Mar 2014 13:43:59 +0000 (15:43 +0200)]
Add "prefer_tcp" flag to "rtsp_flags"

If set, and if TCP is available as RTSP RTP transport, then TCP will be
tried first as RTP transport.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoav_vdpau_get_profile: mask out H.264 intra profile flag
Rémi Denis-Courmont [Tue, 4 Mar 2014 19:13:09 +0000 (19:13 +0000)]
av_vdpau_get_profile: mask out H.264 intra profile flag

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agox86/synth_filter: add missing HAVE_YASM guard
James Almer [Tue, 4 Mar 2014 08:47:38 +0000 (05:47 -0300)]
x86/synth_filter: add missing HAVE_YASM guard

Should fix compilation failures with --disable-yasm on some compilers

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3407172b36a93cec410c6a287dbeec0f41257512'
Michael Niedermayer [Tue, 4 Mar 2014 21:17:51 +0000 (22:17 +0100)]
Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'

* commit '3407172b36a93cec410c6a287dbeec0f41257512':
  avienc: K&R formatting cosmetics

Conflicts:
libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'
Michael Niedermayer [Tue, 4 Mar 2014 21:01:24 +0000 (22:01 +0100)]
Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'

* commit '4c41a7a1798dd6c60e40f79be12faa98a9347151':
  vf_frei0r: fix missing end of line character

Conflicts:
libavfilter/vf_frei0r.c

No change as the token parsing change was not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'
Michael Niedermayer [Tue, 4 Mar 2014 20:55:16 +0000 (21:55 +0100)]
Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
  doc: fix a couple of typos in frame.h

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavienc: K&R formatting cosmetics
Keiji Costantini [Fri, 28 Feb 2014 18:58:20 +0000 (19:58 +0100)]
avienc: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agovf_frei0r: fix missing end of line character
Vittorio Giovara [Tue, 4 Mar 2014 17:27:09 +0000 (18:27 +0100)]
vf_frei0r: fix missing end of line character

Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.

5 years agodoc: fix a couple of typos in frame.h
Vittorio Giovara [Tue, 4 Mar 2014 14:16:51 +0000 (15:16 +0100)]
doc: fix a couple of typos in frame.h

5 years agoavformat/mpegtsenc: fix HEVC MPEG TS stream type
olugbone [Mon, 3 Mar 2014 19:32:41 +0000 (19:32 +0000)]
avformat/mpegtsenc: fix HEVC MPEG TS stream type

Allowing HEVC video using TS stream type 0x24

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 4 Mar 2014 13:12:26 +0000 (14:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  put_bits: Remove unused includes

Conflicts:
libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'
Michael Niedermayer [Tue, 4 Mar 2014 12:37:58 +0000 (13:37 +0100)]
Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'

* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1':
  mathops: move macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
Michael Niedermayer [Tue, 4 Mar 2014 12:26:48 +0000 (13:26 +0100)]
Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'

* commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d':
  vf_frei0r: refactor library loading from env variable

Conflicts:
configure
libavfilter/vf_frei0r.c

Not merged, we use av_strtok() which leads to simpler code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
Michael Niedermayer [Tue, 4 Mar 2014 11:50:45 +0000 (12:50 +0100)]
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'

* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
  vf_frei0r: prevent a segfault when filter parameters are not set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
Michael Niedermayer [Tue, 4 Mar 2014 11:41:31 +0000 (12:41 +0100)]
Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
  vf_frei0r: adjust error messages

Conflicts:
libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoput_bits: Remove unused includes
Vittorio Giovara [Wed, 26 Feb 2014 01:26:29 +0000 (02:26 +0100)]
put_bits: Remove unused includes

This requires adding includes to other files that relied on these being
included implicitly.

5 years agomathops: move macro to the only place it is used
Vittorio Giovara [Sat, 1 Mar 2014 12:01:43 +0000 (13:01 +0100)]
mathops: move macro to the only place it is used

This helps in disentangling lavf and lavc too.

5 years agovf_frei0r: refactor library loading from env variable
Vittorio Giovara [Thu, 27 Feb 2014 11:29:37 +0000 (12:29 +0100)]
vf_frei0r: refactor library loading from env variable

strtok_r is not needed any more, so remove it from configure.

5 years agovf_frei0r: prevent a segfault when filter parameters are not set
Vittorio Giovara [Thu, 27 Feb 2014 11:06:15 +0000 (12:06 +0100)]
vf_frei0r: prevent a segfault when filter parameters are not set

5 years agovf_frei0r: adjust error messages
Vittorio Giovara [Thu, 27 Feb 2014 12:41:57 +0000 (13:41 +0100)]
vf_frei0r: adjust error messages

5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Tue, 4 Mar 2014 02:41:45 +0000 (03:41 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/avdevice: add device iterators
  lavd: add categories to device implementations
  lavu/log: add device categories

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h263dec: Workaround H263 end padding bug
Michael Niedermayer [Tue, 4 Mar 2014 01:47:12 +0000 (02:47 +0100)]
avcodec/h263dec: Workaround H263 end padding bug

Fixes: H263PaddingBugFixVID_6647.MOV

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/avdevice: add device iterators
Lukasz Marek [Sat, 22 Feb 2014 22:32:55 +0000 (23:32 +0100)]
lavd/avdevice: add device iterators

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd: add categories to device implementations
Lukasz Marek [Sat, 22 Feb 2014 22:32:51 +0000 (23:32 +0100)]
lavd: add categories to device implementations

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavu/log: add device categories
Lukasz Marek [Sat, 22 Feb 2014 22:32:45 +0000 (23:32 +0100)]
lavu/log: add device categories

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoavformat/microdvd: export the declared frame rate
wm4 [Sun, 2 Mar 2014 21:36:42 +0000 (22:36 +0100)]
avformat/microdvd: export the declared frame rate

MicroDVD files are normally frame-based (i.e. there are no absolute
timestamps), but can have an optional frame rate header. If this
header is missing, the timestamps depend on the frame rate of the
video they were created for.

The demuxer will use a fallback frame rate if it's missing from the
header. Currently, applications using libavformat can't know whether
the time base is based on the fallback value, or if a frame rate
header was present.

This commit introduces a subfps AVOption for MicroDVD, and the
demuxer sets it if and only if a frame rate header was present.

Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agoavformat/microdvd: skip BOM properly
wm4 [Sun, 2 Mar 2014 21:36:41 +0000 (22:36 +0100)]
avformat/microdvd: skip BOM properly

The BOM is already skipped in the probe function, but not the header
read function. This could cause the header to be misparsed, such as
not interpreting the FPS line.

5 years agoffmpeg: dont try to run the subtitle encoder on non subtitle streams
Michael Niedermayer [Mon, 3 Mar 2014 19:45:41 +0000 (20:45 +0100)]
ffmpeg: dont try to run the subtitle encoder on non subtitle streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/httpauth: add comment about "" and algorithm
Michael Niedermayer [Mon, 3 Mar 2014 16:04:57 +0000 (17:04 +0100)]
avformat/httpauth: add comment about "" and algorithm

Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard
Willy Aubry [Wed, 5 Feb 2014 13:59:00 +0000 (14:59 +0100)]
avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard

When using the wrap option the EXT-X-MEDIA-SEQUENCE header of the playlist file was reset instead of being incremented.
It is now incremented by one for every media URI removed from the playlist file as the standard states.

Signed-off-by: Willy Aubry <waubry@viotech.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibutvideoenc: Add support for the new BT.709 FourCCs for YCbCr
Jan Ekström [Sat, 15 Feb 2014 06:58:14 +0000 (01:58 -0500)]
libutvideoenc: Add support for the new BT.709 FourCCs for YCbCr

With cli usage the decoder might have not set the colorspace during
encoder init, manual colorspace override might be needed in such
cases.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This applies commit 5de64bb3 (the source of the above commit message)
to libutvideoenc as well.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: detect MPEG streams with faulty DTS and discard affected DTS
Michael Niedermayer [Mon, 3 Mar 2014 00:55:18 +0000 (01:55 +0100)]
avformat/utils: detect MPEG streams with faulty DTS and discard affected DTS

Fixes issue2.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'
Michael Niedermayer [Sun, 2 Mar 2014 20:44:44 +0000 (21:44 +0100)]
Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'

* commit '5c9c305d14730faf2af206e5d519df4948de0ed2':
  ass: K&R formatting cosmetics

Conflicts:
libavformat/assdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevcpred_template: also initialize top[-1] for constrained intra prediction
Michael Niedermayer [Sun, 2 Mar 2014 20:17:48 +0000 (21:17 +0100)]
avcodec/hevcpred_template: also initialize top[-1] for constrained intra prediction

Fixes out of array read
Fixes: 387713a12dc5cfa27fcb4178084ce1ea-asan_stack-oob_131176a_1182_cov_3861068719_CAINIT_C_SHARP_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: also reset local got_header when reseting the context got_header
Michael Niedermayer [Sun, 2 Mar 2014 14:18:09 +0000 (15:18 +0100)]
avcodec/g2meet: also reset local got_header when reseting the context got_header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: fix error returns
Michael Niedermayer [Sun, 2 Mar 2014 14:16:37 +0000 (15:16 +0100)]
avcodec/g2meet: fix error returns

Fixes out of array accesses

This should not affect any release

Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoass: K&R formatting cosmetics
Patrice Clement [Fri, 28 Feb 2014 17:31:29 +0000 (18:31 +0100)]
ass: K&R formatting cosmetics

5 years agoRevert "mpegts: do not set pts for missing dts in video streams"
Michael Niedermayer [Sun, 2 Mar 2014 11:41:10 +0000 (12:41 +0100)]
Revert "mpegts: do not set pts for missing dts in video streams"

This reverts commit f65afef1df49f53e14c8d4173ff960fff8d44ecb.

If only pts is coded then dts must be equal pts
See Rec. ITU-T H.222.0 (06/2012) / ISO/IEC 13818-1:2013 (E) 2.7.5

Found-by: Baptiste Coudurier
5 years agox86/synth_filter: Revert the switch to float ops with SSE2
James Almer [Sun, 2 Mar 2014 02:46:27 +0000 (23:46 -0300)]
x86/synth_filter: Revert the switch to float ops with SSE2

This reverts the changes 64672098361361cd15d37e36f747ab44de5b80ca
and 68c3ed936a76c3ff7738f602fa90237ac7e3ce08 did to the SSE2 version,
which generated a hit of about 5 cycles.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparsevorbis: check packet size before reading new_len from it
Michael Niedermayer [Sun, 2 Mar 2014 04:02:15 +0000 (05:02 +0100)]
avformat/oggparsevorbis: check packet size before reading new_len from it

Fixes out of array read
Fixes: 34260c7981118fb38fba61809bf4dd5a-asan_heap-oob_93b923_1508_cov_951051643_DivX640x480_oggvorbis.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()
Michael Niedermayer [Sun, 2 Mar 2014 03:15:40 +0000 (04:15 +0100)]
avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()

Fixes out of array read
Fixes: 0ff9841c2a102f06e0d582bfc3376cbd-asan_heap-oob_495589_6836_cov_1763916974_mewmew_ssa.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 2 Mar 2014 00:14:59 +0000 (01:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ituh263: reject b-frame with pp_time = 0

See: bb01be80462adcf4900c925e25bc644e512a4b7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/synth_filter: add synth_filter_avx
James Almer [Sat, 1 Mar 2014 18:26:50 +0000 (15:26 -0300)]
x86/synth_filter: add synth_filter_avx

Sandy Bridge Win64:
180 cycles on ff_synth_filter_inner_sse2
150 cycles on ff_synth_filter_inner_avx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: optimize mp3_seek() for dir < 0
Michael Niedermayer [Sat, 1 Mar 2014 23:18:25 +0000 (00:18 +0100)]
avformat/mp3dec: optimize mp3_seek() for dir < 0

this minimizes the amount of protocol seeks and reading needed in that case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: optimize sequential backward seeking
Michael Niedermayer [Sat, 1 Mar 2014 22:09:40 +0000 (23:09 +0100)]
avformat/aviobuf: optimize sequential backward seeking

This reduces the number of protocol seeks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: factorize buffer_size out
Michael Niedermayer [Sat, 1 Mar 2014 21:55:37 +0000 (22:55 +0100)]
avformat/aviobuf: factorize buffer_size out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoituh263: reject b-frame with pp_time = 0
Keiji Costantini [Sat, 1 Mar 2014 18:17:04 +0000 (18:17 +0000)]
ituh263: reject b-frame with pp_time = 0

Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.

Sample-Id: 00000168-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoRELEASE: update for 2.2
Michael Niedermayer [Sat, 1 Mar 2014 16:09:12 +0000 (17:09 +0100)]
RELEASE: update for 2.2

Found-by: Timothy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/synth_filter: add synth_filter_sse
James Almer [Sat, 1 Mar 2014 03:32:07 +0000 (00:32 -0300)]
x86/synth_filter: add synth_filter_sse

Build only on x86_32 targets.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoHLS: Handle the case when hls_list_size=0. Playlist file should contain all the segme...
Senthilnathan M [Sat, 1 Mar 2014 07:43:51 +0000 (13:13 +0530)]
HLS: Handle the case when hls_list_size=0. Playlist file should contain all the segments. Fixes bug #3376.

Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 1 Mar 2014 14:06:32 +0000 (15:06 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qt-faststart: Add a note about the -movflags +faststart feature

Conflicts:
tools/qt-faststart.c

See: 2574d62d0dd34df762aa2d80c7d6381918a80ed1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'
Michael Niedermayer [Sat, 1 Mar 2014 13:39:39 +0000 (14:39 +0100)]
Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'

* commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6':
  qt-faststart: Avoid unintentionally sign extending BE_32

See: 582f36ca3fb1c69dbe3478f174d36278f5dd3f63
See: 69ce34c796dd2d595f3312848cf6d0c87506e0d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'
Michael Niedermayer [Sat, 1 Mar 2014 13:32:22 +0000 (14:32 +0100)]
Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'

* commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8':
  qt-faststart: Check offset_count before reading from the moov_atom buffer

Conflicts:
tools/qt-faststart.c

See: 0ea4742341726ebe42c301bc0d6426cfa01dd134
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '63848854256a024a19435e87d6bc76fffa65e81e'
Michael Niedermayer [Sat, 1 Mar 2014 13:19:04 +0000 (14:19 +0100)]
Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'

* commit '63848854256a024a19435e87d6bc76fffa65e81e':
  qt-faststart: Check the ftello() return codes

Conflicts:
tools/qt-faststart.c

See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'
Michael Niedermayer [Sat, 1 Mar 2014 13:10:49 +0000 (14:10 +0100)]
Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'

* commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b':
  qt-faststart: Fix the signedness of variables keeping the ftello return values

Conflicts:
tools/qt-faststart.c

See: 1838961357e38402be64c0c82a2f08e4e85a0c01
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'
Michael Niedermayer [Sat, 1 Mar 2014 12:54:35 +0000 (13:54 +0100)]
Merge commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475'

* commit '5612244351b2eb3cb4e6225861a0f55aa5d0c475':
  qt-faststart: Check fseeko() return codes

Conflicts:
tools/qt-faststart.c

See: 0de41ead6f9034e0a834abe51028a02aee094990
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'
Michael Niedermayer [Sat, 1 Mar 2014 12:47:08 +0000 (13:47 +0100)]
Merge commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f'

* commit 'ea15a9a5d8fa6a71af3101b2af18c4dcac07987f':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
tools/qt-faststart.c

See: 59003fe7c064e98359cce83b1b727fb1026bdf12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'
Michael Niedermayer [Sat, 1 Mar 2014 12:37:07 +0000 (13:37 +0100)]
Merge commit '3cbc7ef3d60b6af3617079f24a4f401d83353003'

* commit '3cbc7ef3d60b6af3617079f24a4f401d83353003':
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
tools/qt-faststart.c

See: f4d9148fe282879b9fcc755767c9c04de9ddbcfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd1f9563d502037239185c11578cc614bdf0c5870'
Michael Niedermayer [Sat, 1 Mar 2014 12:26:47 +0000 (13:26 +0100)]
Merge commit 'd1f9563d502037239185c11578cc614bdf0c5870'

* commit 'd1f9563d502037239185c11578cc614bdf0c5870':
  pthread_frame: flush all threads on flush, not just the first one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'
Michael Niedermayer [Sat, 1 Mar 2014 12:18:25 +0000 (13:18 +0100)]
Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'

* commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0':
  af_compand: replace strtok_r() with av_get_token()

Conflicts:
configure
libavfilter/af_compand.c

Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'
Michael Niedermayer [Sat, 1 Mar 2014 12:07:36 +0000 (13:07 +0100)]
Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'

* commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810':
  configure: Set the thread type after resolving dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2f02bbcca050936686482453078e83dc25493da0'
Michael Niedermayer [Sat, 1 Mar 2014 11:37:38 +0000 (12:37 +0100)]
Merge commit '2f02bbcca050936686482453078e83dc25493da0'

* commit '2f02bbcca050936686482453078e83dc25493da0':
  build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '34150be515cd9c43b0b679806b8d01774960af78'
Michael Niedermayer [Sat, 1 Mar 2014 11:27:59 +0000 (12:27 +0100)]
Merge commit '34150be515cd9c43b0b679806b8d01774960af78'

* commit '34150be515cd9c43b0b679806b8d01774960af78':
  build: Let the iac decoder depend on the imc decoder

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'
Michael Niedermayer [Sat, 1 Mar 2014 11:17:51 +0000 (12:17 +0100)]
Merge commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde'

* commit '8e0cf39faf02536dca08f4fe628a66d1ae022fde':
  build: Let all MJPEG-related decoders depend on the MJPEG decoder

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0a36988e48dd581d29e77f768f987738bdf365f0'
Michael Niedermayer [Sat, 1 Mar 2014 04:11:37 +0000 (05:11 +0100)]
Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'

* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
  build: Let AMV decoder depend on the SP5X decoder

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f4bd9fe326ad1315a74206939ae56df93b940a09'
Michael Niedermayer [Sat, 1 Mar 2014 04:03:37 +0000 (05:03 +0100)]
Merge commit 'f4bd9fe326ad1315a74206939ae56df93b940a09'

* commit 'f4bd9fe326ad1315a74206939ae56df93b940a09':
  h264: fix clang warning about uninitialized variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '17a63ff0cd187b9e50e4a47862750295976853b1'
Michael Niedermayer [Sat, 1 Mar 2014 03:55:41 +0000 (04:55 +0100)]
Merge commit '17a63ff0cd187b9e50e4a47862750295976853b1'

* commit '17a63ff0cd187b9e50e4a47862750295976853b1':
  h264: update flag name in ff_h264_decode_ref_pic_list_reordering()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ee6280ca12696a67535ce2245c77190edc513794'
Michael Niedermayer [Sat, 1 Mar 2014 03:50:08 +0000 (04:50 +0100)]
Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'

* commit 'ee6280ca12696a67535ce2245c77190edc513794':
  h264: parse two additional constraint flags

Conflicts:
libavcodec/h264_ps.c

See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2' n2.3-dev
Michael Niedermayer [Sat, 1 Mar 2014 03:30:53 +0000 (04:30 +0100)]
Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'

* commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2':
  h264: add MVCD to the list of High profiles in SPS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoupdate for 2.2
Michael Niedermayer [Sat, 1 Mar 2014 02:34:59 +0000 (03:34 +0100)]
update for 2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utvideoenc: fix slice_bits size
Michael Niedermayer [Sat, 1 Mar 2014 01:40:19 +0000 (02:40 +0100)]
avcodec/utvideoenc: fix slice_bits size

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/ac3dec: Use avpriv_ac3_parse_header2()
Michael Niedermayer [Sat, 1 Mar 2014 00:56:25 +0000 (01:56 +0100)]
avformat/ac3dec: Use avpriv_ac3_parse_header2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodec
Michael Niedermayer [Sat, 1 Mar 2014 00:47:33 +0000 (01:47 +0100)]
avcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodec

The new function has the ability to allocate the structure, allowing it to grow
without needing major bumps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3: move new field to the end of AC3HeaderInfo
Michael Niedermayer [Sat, 1 Mar 2014 00:45:49 +0000 (01:45 +0100)]
avcodec/ac3: move new field to the end of AC3HeaderInfo

This structure is used in the interface between libs and thus cannot have
fields added in the middle without major bump

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: allow max=min=0 for pixel formats
Michael Niedermayer [Fri, 28 Feb 2014 22:55:34 +0000 (23:55 +0100)]
avutil/opt: allow max=min=0 for pixel formats

This is neccessary for maintaining ABI compatibility with FFmpeg 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoqt-faststart: Add a note about the -movflags +faststart feature
Lou Logan [Tue, 7 Jan 2014 19:59:04 +0000 (10:59 -0900)]
qt-faststart: Add a note about the -movflags +faststart feature

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoqt-faststart: Avoid unintentionally sign extending BE_32
Martin Storsjö [Fri, 28 Feb 2014 10:19:49 +0000 (12:19 +0200)]
qt-faststart: Avoid unintentionally sign extending BE_32

Without this cast, the BE_32() expression is sign extended when
assigned to an uint64_t, since the uint8_t|uint8_t expression
is promoted to an int.

Also avoid undefined behaviour when left shifting an uint8_t
by 24 by casting it to an uint32_t explicitly before shifting.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoqt-faststart: Check offset_count before reading from the moov_atom buffer
Michael Niedermayer [Thu, 13 Dec 2012 14:07:20 +0000 (15:07 +0100)]
qt-faststart: Check offset_count before reading from the moov_atom buffer

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoqt-faststart: Check the ftello() return codes
Michael Niedermayer [Wed, 24 Oct 2012 22:39:33 +0000 (00:39 +0200)]
qt-faststart: Check the ftello() return codes

This silences a warning in the coverity static analyzer.

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