ffmpeg.git
5 years agoupdate for 2.2 n2.2
Michael Niedermayer [Sun, 23 Mar 2014 20:13:49 +0000 (21:13 +0100)]
update for 2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
(cherry picked from commit 9deecdf85f0c1cebcc0a157114bf6dbc02a0a120)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMove avpriv_find_pix_fmt() to utils.c
Michael Niedermayer [Sun, 23 Mar 2014 12:25:42 +0000 (13:25 +0100)]
Move avpriv_find_pix_fmt() to utils.c

Fixes build with --disable-everything

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 82a90e7764ad04afd3679e4e4e89d85c7e4d4b53)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()
Michael Niedermayer [Sat, 15 Mar 2014 21:52:22 +0000 (22:52 +0100)]
swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c47a4e972485e5f0c812159373f703c6f1d089f)

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>
(cherry picked from commit 2dcaa1b9d142ae113b28bffdbf7f8f8900b5e770)

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>
(cherry picked from commit 8b8ae298afb32979c81310ffdc9904d29497db5f)

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>
(cherry picked from commit 6b53c1aa822e9c92be52a462dd0aef1c2010ce73)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
(cherry picked from commit 0bf882864ecd228d53555c57595eeca048662991)

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>
(cherry picked from commit 171dd67520b649a5b7a0f4fbff72ac88bbedfeab)

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>
(cherry picked from commit 9600486d10a9728f1503363334268ecfafa9b0e5)

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>
(cherry picked from commit 2adf422ce24bd8038d5d2f50549d0d3fb4170171)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Add padding after the remaining AVFrames
Michael Niedermayer [Mon, 17 Mar 2014 23:08:54 +0000 (00:08 +0100)]
avcodec: Add padding after the remaining AVFrames

This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded

A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc567ac49e17151f00f31b59030cd10f952612ef)

Conflicts:

libavcodec/h264.h
(cherry picked from commit 618d062bd553a7d7fad194d4236913f2b0a0251e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3enc: use av_copy_packet()
Michael Niedermayer [Sat, 22 Mar 2014 00:26:48 +0000 (01:26 +0100)]
avformat/mp3enc: use av_copy_packet()

Fixes double free
Fixes Ticket3476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d003a0cd2e587a47627fd328f9fc5a484adc29f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/snowenc: allow larger mb variances
Michael Niedermayer [Fri, 21 Mar 2014 17:29:16 +0000 (18:29 +0100)]
avcodec/snowenc: allow larger mb variances

Fixes assertion failure
Fixes Ticket3463

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2fd14f062cfc52db1529a46b53a26b06cb418f55)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:25:36 +0000 (18:25 +0100)]
avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit

This avoids hypothetical integer overflows
(cherry picked from commit b4356c9cc28197bb8da626ece08d4a062b62afc8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:24:56 +0000 (18:24 +0100)]
avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit

This avoids a hypothetical integer overflow with very high resolution video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e92a78a4095d69d876bef189225608a35166dc4a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:12:58 +0000 (18:12 +0100)]
avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit

This avoids a hypothetical integer overflow with very high resolution video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3272674c943474ec6bfcd75e0d9b4b4ca95ff32)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: dont call exit_program() from a signal hander
Michael Niedermayer [Fri, 21 Mar 2014 14:45:03 +0000 (15:45 +0100)]
ffmpeg: dont call exit_program() from a signal hander

This is unsafe and can deadlock amongth other things

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9dca02ee541120de2a96c387faed9a4e033a60fd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1
Michael Niedermayer [Wed, 19 Mar 2014 17:01:04 +0000 (18:01 +0100)]
avcodec/mjpegdec: Switch default interlaced polarity for MJPG to 1

Fixes Ticket3229

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dde16f5aaed327e15049b40a8dfae1f59647e4ec)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: parse avid data from extradata
Michael Niedermayer [Wed, 19 Mar 2014 16:59:42 +0000 (17:59 +0100)]
avcodec/mjpegdec: parse avid data from extradata

Makes no difference for any file tested but is needed
for following bug-fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 493296800c4cfd76561f71ded5f0893108063e67)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpeg: print info from parse_avid() if requested
Michael Niedermayer [Wed, 19 Mar 2014 16:59:02 +0000 (17:59 +0100)]
avcodec/mjpeg: print info from parse_avid() if requested

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 046a75eea091e7d079bd3e5c9f5f028d7b920c32)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID
Michael Niedermayer [Wed, 19 Mar 2014 16:57:59 +0000 (17:57 +0100)]
avcodec/mjpegdec: switch interlaced_polarity to 0 for PAL AVID

0 should have been the default, this change should make no difference
but this is needed for the following bugfix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 98f9aa389b2de69118cd599235b2208b3c311c4c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: factorize parse_avid out
Michael Niedermayer [Wed, 19 Mar 2014 16:57:02 +0000 (17:57 +0100)]
avcodec/mjpegdec: factorize parse_avid out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1083c479eb6e5bcd5220fdd165cf9312f29a0985)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2()
Michael Niedermayer [Mon, 17 Mar 2014 23:07:53 +0000 (00:07 +0100)]
avcodec/utils: fix sizeof(AVFrame) dependence in  avcodec_encode_audio2()

This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8ab80707841a73ca7708e1e1aa97f3513fff3d35)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: take aspect ratio into account.
Nicolas George [Mon, 25 Nov 2013 16:26:07 +0000 (17:26 +0100)]
lavd/xv: take aspect ratio into account.
(cherry picked from commit c37bbe54f400edc8cb0070138328048943e90b1a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/pthread: copy packet side data.
Nicolas George [Thu, 20 Feb 2014 19:52:06 +0000 (20:52 +0100)]
lavc/pthread: copy packet side data.
(cherry picked from commit ea6825fd090ef3f8edbce506d2fbf6e187f585fa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f25e6e0c255a6d81971fe66f6c32d29be0706f3d' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 19:11:49 +0000 (20:11 +0100)]
Merge commit 'f25e6e0c255a6d81971fe66f6c32d29be0706f3d' into release/2.2

* commit 'f25e6e0c255a6d81971fe66f6c32d29be0706f3d':
  RELEASE_NOTES: mention new filters

Conflicts:
doc/RELEASE_NOTES

Not merged as these things where in past ffmpeg releases already.
    Or at least some of them where, volunteers to checks this and update
    our release notes are welcome

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAlways pass the configure option sysroot to --sysroot and -isysroot.
Carl Eugen Hoyos [Sun, 23 Mar 2014 16:57:32 +0000 (17:57 +0100)]
Always pass the configure option sysroot to --sysroot and -isysroot.

On darwin, --sysroot may be ignored.

(cherry picked from commit cc6d549adbb838ef87b1f251ca469dc4c3dd39aa)

5 years agoMerge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 18:56:37 +0000 (19:56 +0100)]
Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2

* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
  af_channelmap: fix ONE_STR mapping mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '26bbc1c242ebfeec3c49585207efac7293632433' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 18:54:52 +0000 (19:54 +0100)]
Merge commit '26bbc1c242ebfeec3c49585207efac7293632433' into release/2.2

* commit '26bbc1c242ebfeec3c49585207efac7293632433':
  Prepare for 10 Release

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect VDA like all other hardware acccelerations.
Carl Eugen Hoyos [Sun, 23 Mar 2014 12:24:07 +0000 (13:24 +0100)]
Autodetect VDA like all other hardware acccelerations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 942cded690bc6dc931c60078f39cf0f339a89058)

Conflicts:
configure

5 years agoRELEASE_NOTES: mention new filters
Vittorio Giovara [Sun, 23 Mar 2014 16:28:34 +0000 (17:28 +0100)]
RELEASE_NOTES: mention new filters

5 years agoaf_channelmap: fix ONE_STR mapping mode
Anton Khirnov [Tue, 4 Mar 2014 06:19:46 +0000 (07:19 +0100)]
af_channelmap: fix ONE_STR mapping mode

get_channel() returns 0 on success

CC:libav-stable@libav.org
(cherry picked from commit e843612695007cc623813073754c651ab43021f7)

5 years agoPrepare for 10 Release
Reinhard Tartler [Sun, 23 Mar 2014 15:38:38 +0000 (11:38 -0400)]
Prepare for 10 Release

5 years agoMerge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 03:05:56 +0000 (04:05 +0100)]
Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2

* commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 02:20:00 +0000 (03:20 +0100)]
Merge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2

* commit '9a6a7109985cbd3a20707b40cc31ed53a174195c':
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'daaef403d122b35d87b27d6b369d287b1ed06973' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 02:14:03 +0000 (03:14 +0100)]
Merge commit 'daaef403d122b35d87b27d6b369d287b1ed06973' into release/2.2

* commit 'daaef403d122b35d87b27d6b369d287b1ed06973':
  matroskaenc: write private data in hvcC format for HEVC.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 02:12:28 +0000 (03:12 +0100)]
Merge commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f' into release/2.2

* commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '230c4c6ad9f74697e77351d32e679bf0c24478ea' into release/2.2
Michael Niedermayer [Sun, 23 Mar 2014 02:11:19 +0000 (03:11 +0100)]
Merge commit '230c4c6ad9f74697e77351d32e679bf0c24478ea' into release/2.2

* commit '230c4c6ad9f74697e77351d32e679bf0c24478ea':
  armv6: vp8: use explicit labels in motion compensation asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomovenc: Allow override of major brand in ftyp atom
John Stebbins [Tue, 18 Mar 2014 13:11:00 +0000 (13:11 +0000)]
movenc: Allow override of major brand in ftyp atom

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
(cherry picked from commit 1e9db41e2a2166be5671b088ef4ad06a40af459f)

5 years agomatroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Tim Walker [Mon, 3 Mar 2014 14:53:45 +0000 (14:53 +0000)]
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

(cherry picked from commit 558b20d729bc296d8e6a69f03cd509ad26a4827d)

5 years agomatroskaenc: write private data in hvcC format for HEVC.
Tim Walker [Mon, 3 Mar 2014 14:53:44 +0000 (14:53 +0000)]
matroskaenc: write private data in hvcC format for HEVC.

(cherry picked from commit a823d0948683bd97dd58556b5740e434166209a8)

5 years agoAdd APIchanges entry and bump libswscale micro version for making gray16 full-scale.
Carl Eugen Hoyos [Wed, 19 Mar 2014 08:14:53 +0000 (09:14 +0100)]
Add APIchanges entry and bump libswscale micro version for making gray16 full-scale.

5 years agoswscale/utils: Fix color range of gray16
Carl Eugen Hoyos [Tue, 18 Mar 2014 02:19:18 +0000 (03:19 +0100)]
swscale/utils: Fix color range of gray16

Improves rgb -> gray16 conversion

Fixes Ticket3422

The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 37c07d45290cf9cdad061cd5c2af94a2783ba847)

5 years agoavcodec/mpegvideo_enc: dont use direct mode for unaligned input
Michael Niedermayer [Sat, 15 Mar 2014 13:50:37 +0000 (14:50 +0100)]
avcodec/mpegvideo_enc: dont use direct mode for unaligned input

Fixes Ticket3456

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 06a3185e38614ff22e4586675b85228f07819452)

5 years agoavcodec: Move STRIDE_ALIGN to internal.h
Michael Niedermayer [Sat, 15 Mar 2014 13:47:04 +0000 (14:47 +0100)]
avcodec: Move STRIDE_ALIGN to internal.h

The next commit/bugfix will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit da89572004f6c0279134d4c8c1c835496a2c4232)

5 years agoavcodec/adpcm: squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM...
Peter Ross [Fri, 14 Mar 2014 09:02:04 +0000 (20:02 +1100)]
avcodec/adpcm: squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R2/3

These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore
the the number of samples returned by get_nb_samples() is only ever approximate.

Fixes ticket #3460.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7380201451a2edfb240cd356579c4c39a87cf5bd)

5 years agoavcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary
Peter Ross [Sat, 15 Mar 2014 00:16:19 +0000 (11:16 +1100)]
avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary

Fixes ticket #3461.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1bb17940dd242e56541775318636bcbe3eab73d)

5 years agoffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
Michael Niedermayer [Sun, 16 Mar 2014 14:15:02 +0000 (15:15 +0100)]
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams

Fixes Ticket3470

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 25bcf24d4d0faf0191923be8afac8f67ca98b500)

5 years agoavcodec/h264: be more tolerant on what pixel format changes trigger reinits
Michael Niedermayer [Mon, 17 Mar 2014 01:25:20 +0000 (02:25 +0100)]
avcodec/h264: be more tolerant on what pixel format changes trigger reinits

Fixes Ticket3260

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8e92ff25469f75f5c1fcbb9ba5721cea341ca34a)

5 years agodoc: Point to the correct, actually maintained gas-preprocessor repo
Martin Storsjö [Wed, 12 Mar 2014 11:46:04 +0000 (13:46 +0200)]
doc: Point to the correct, actually maintained gas-preprocessor repo

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d15c536123a44362ace6299c391a492c90b83fc7)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarmv6: vp8: use explicit labels in motion compensation asm
Janne Grunau [Mon, 10 Mar 2014 22:58:35 +0000 (23:58 +0100)]
armv6: vp8: use explicit labels in motion compensation asm

The integrated arm assembler in clang-503.0.38 (Xcode-5.1) seems
to get confused by the offset of 4 and decides to use a non-wide
thumb encoding. That fails since the labels are out of range of
the limited offset a 16-bit thumb encoding offers.

5 years agoMerge commit 'b5210f4eae30df587815b5f005f219aa723591d3' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 03:12:43 +0000 (04:12 +0100)]
Merge commit 'b5210f4eae30df587815b5f005f219aa723591d3' into release/2.2

* commit 'b5210f4eae30df587815b5f005f219aa723591d3':
  http: Properly initialize icy headers string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '10379d50be18325a07ef297bd2120d85a58ec78b' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 03:12:29 +0000 (04:12 +0100)]
Merge commit '10379d50be18325a07ef297bd2120d85a58ec78b' into release/2.2

* commit '10379d50be18325a07ef297bd2120d85a58ec78b':
  http: Declare more parameters as const where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 03:06:49 +0000 (04:06 +0100)]
Merge commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c' into release/2.2

* commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c':
  http: Allow setting a Content-Type for POST requests

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 03:02:57 +0000 (04:02 +0100)]
Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2

* commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa':
  http: Improve options descriptions

Conflicts:
doc/protocols.texi
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:56:19 +0000 (03:56 +0100)]
Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2

* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd':
  http: Always allow no-op seek

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:38:30 +0000 (03:38 +0100)]
Merge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2

* commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76':
  http: Add support for selecting a request range

Conflicts:
doc/protocols.texi
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:38:07 +0000 (03:38 +0100)]
Merge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2

* commit '09dca5106698871920328ae8041d1437ce3cff43':
  http: Support setting custom User-Agent

Conflicts:
doc/protocols.texi
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '40de74d0eb8c1898e2184a1484fe246aed5b295d' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:37:53 +0000 (03:37 +0100)]
Merge commit '40de74d0eb8c1898e2184a1484fe246aed5b295d' into release/2.2

* commit '40de74d0eb8c1898e2184a1484fe246aed5b295d':
  http: Export Content-Type information

Conflicts:
doc/protocols.texi
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:30:09 +0000 (03:30 +0100)]
Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2

* commit 'e2811c2ede428a20aec3630bef4378f2927fb306':
  http: Add support reading ICY metadata

Conflicts:
doc/protocols.texi
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:29:40 +0000 (03:29 +0100)]
Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2

* commit '25d14b716aef43bf9e82f1d67a364e5922332f47':
  http: Refactor process_line

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1de93dec302cc860c718e89656f184510b2d239' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:29:24 +0000 (03:29 +0100)]
Merge commit 'f1de93dec302cc860c718e89656f184510b2d239' into release/2.2

* commit 'f1de93dec302cc860c718e89656f184510b2d239':
  http: K&R formatting cosmetics

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohttp: handle ICY in presence of chunked transfer encoding
wm4 [Sun, 2 Mar 2014 19:26:19 +0000 (20:26 +0100)]
http: handle ICY in presence of chunked transfer encoding

Some http servers send an ICY stream in combination with chunked
transfer encoding. This case was handled incorrectly by the ICY code:
instead of handling chunked encoding before anything ICY related, both
were mixed.

Fix this by separating the ICY code from normal http reading. Move the
normal http reading to a new function http_read_stream(), while
http_read() handles ICY on top of http_read_stream().

The server identified itself as: cloudflare-nginx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 636273d3d4a8c42f51832e8bf83e566e875916bf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 67f67a3748a038d880ed8a642184d2e3c76e29bb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '738d68d' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 02:00:17 +0000 (03:00 +0100)]
Merge commit '738d68d' into release/2.2

* commit '738d68d':
  http: Drop doxy comments

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '00ecce5' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 01:59:41 +0000 (02:59 +0100)]
Merge commit '00ecce5' into release/2.2

* commit '00ecce5':
  http: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b920c1d' into release/2.2
Michael Niedermayer [Sun, 16 Mar 2014 01:58:37 +0000 (02:58 +0100)]
Merge commit 'b920c1d' into release/2.2

* commit 'b920c1d':
  configure: Support older version of openjpeg1

Conflicts:
configure

Not merged as the problematic pkg config code wasnt merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohttp: Properly initialize icy headers string
Alessandro Ghedini [Wed, 12 Mar 2014 15:28:22 +0000 (16:28 +0100)]
http: Properly initialize icy headers string

The icy_metadata_headers string never gets initialized, so,
during the first call to av_strlcatf() in parse_icy(),
strlen() will be called on a pointer to uninitialized memory.
At best this causes some garbage data to be left at the
start of the string.

By initializing icy_metadata_headers to the empty string, the
first call to strlen() will always return 0, so that data is
appended from the start of the string.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 6998a9f4c4e069f515c50614179f4cfc7d0184f5)

5 years agohttp: Declare more parameters as const where possible
Martin Storsjö [Wed, 12 Mar 2014 07:40:05 +0000 (09:40 +0200)]
http: Declare more parameters as const where possible

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e77a2ea9505863e50bf013706f66bf8b7325e524)

5 years agohttp: Allow setting a Content-Type for POST requests
Clément Bœsch [Thu, 6 Mar 2014 17:40:03 +0000 (18:40 +0100)]
http: Allow setting a Content-Type for POST requests

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 2572d07c1f0abd9e2bf3ed20dbe35c58f1dd6ac4)

5 years agohttp: Improve options descriptions
Reinhard Tartler [Sat, 15 Mar 2014 13:51:57 +0000 (09:51 -0400)]
http: Improve options descriptions

Add documentation where missing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit fe568b3d27ca2c5cca3878b2a7a3a968e605aec4)

Conflicts:
libavformat/http.c

5 years agohttp: Always allow no-op seek
Anssi Hannula [Thu, 6 Mar 2014 17:40:01 +0000 (18:40 +0100)]
http: Always allow no-op seek

This also allows checking stream position as per ffurl_seek() doxy.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab)

5 years agohttp: Add support for selecting a request range
Anssi Hannula [Thu, 6 Mar 2014 17:40:00 +0000 (18:40 +0100)]
http: Add support for selecting a request range

Comment from Reimar Döffinger included as pro memoria.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 2ec33d27127251bbc45e1f88e60691ad59cf2319)

5 years agohttp: Support setting custom User-Agent
Clément Bœsch [Thu, 6 Mar 2014 17:39:59 +0000 (18:39 +0100)]
http: Support setting custom User-Agent

Contextually make the default User-Agent use the common
"Name/Version" pattern.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ddfc98906373d1f17f6205cedd14c68d7a75995f)

5 years agohttp: Export Content-Type information
Michael Niedermayer [Thu, 6 Mar 2014 17:39:58 +0000 (18:39 +0100)]
http: Export Content-Type information

Bug-Id: https://bugs.debian.org/740421

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit e58c85b0686892960042232e51c77168b264838a)

5 years agohttp: Add support reading ICY metadata
Luca Barbato [Mon, 10 Mar 2014 20:11:35 +0000 (21:11 +0100)]
http: Add support reading ICY metadata

Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.

Bug-Id: https://bugs.debian.org/739936

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab)

5 years agohttp: Refactor process_line
Luca Barbato [Mon, 10 Mar 2014 19:16:50 +0000 (20:16 +0100)]
http: Refactor process_line

(cherry picked from commit 4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa)

5 years agohttp: K&R formatting cosmetics
Luca Barbato [Mon, 10 Mar 2014 17:02:09 +0000 (18:02 +0100)]
http: K&R formatting cosmetics

(cherry picked from commit 7a2fddb4480121712df560cf619c1c3566cae3ff)

5 years agohttp: Drop doxy comments
Luca Barbato [Mon, 10 Mar 2014 16:53:51 +0000 (17:53 +0100)]
http: Drop doxy comments

(cherry picked from commit 78b21c1d7177e1d61ad3c9225f67699da089aa7c)

5 years agohttp: Return meaningful error codes
Luca Barbato [Mon, 10 Mar 2014 16:17:25 +0000 (17:17 +0100)]
http: Return meaningful error codes

(cherry picked from commit 55a215ba63d9fa79cd7ee265ee2e777ee86b200c)

5 years agoupdate for 2.2-rc2 n2.2-rc2
Michael Niedermayer [Sat, 15 Mar 2014 02:08:20 +0000 (03:08 +0100)]
update for 2.2-rc2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libx265: fill headers in extradata
Michael Niedermayer [Fri, 14 Mar 2014 03:26:24 +0000 (04:26 +0100)]
avcodec/libx265: fill headers in extradata

Fixes Ticket3457

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use
Michael Niedermayer [Thu, 13 Mar 2014 16:32:15 +0000 (17:32 +0100)]
avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b02dfd37cb3bc9521fc6e1f5b5f13c80d144cd2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomvformat/movenc: fix IMX
Michael Niedermayer [Mon, 27 Jan 2014 17:57:52 +0000 (18:57 +0100)]
mvformat/movenc: fix IMX

fixes Ticket3351

Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 72d44f15834af68e2620a7051493359d7ee5b2c3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/texi2pod: fix encoding type
Michael Niedermayer [Thu, 13 Mar 2014 02:06:08 +0000 (03:06 +0100)]
doc/texi2pod: fix encoding type

docs say:
'A document having more than one "=encoding" line should be considered an error. '

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 12ce58bebdff6bfae9c56dc785e3003968f93277)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "Allow stream-copying grayscale mov files."
Carl Eugen Hoyos [Tue, 11 Mar 2014 19:09:07 +0000 (20:09 +0100)]
Revert "Allow stream-copying grayscale mov files."

This reverts commit 691dec62011fe9993809fbc793126b40cac0c584.

The commit did not fix ticket #3215, it was fixed one commit earlier.
The revert may break other use-cases but they should be fixed differently,
the offending commit introduced too many problems.

Fixes ticket #3377.
Fixes ticket #3378.
(cherry picked from commit 54bbe3e2a645b4f7b36efac2bca331d3be98592a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix modplug linkage on Windows.
Matt Oliver [Tue, 11 Mar 2014 03:20:44 +0000 (14:20 +1100)]
Fix modplug linkage on Windows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 99b48fd448fa83252376d1ac96f17c953f07067c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/general.texi: Adjust the notes on AviSynth
Stephen Hutchinson [Wed, 12 Mar 2014 03:02:16 +0000 (23:02 -0400)]
doc/general.texi: Adjust the notes on AviSynth

FFmpeg provides local copies of these headers in compat/avisynth/,
and there is no restriction against using 2.5.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5336cd6374c7cbba9d6e65de1cec9404efcb665f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2
Michael Niedermayer [Sat, 15 Mar 2014 01:40:44 +0000 (02:40 +0100)]
Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2

* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3':
  doc: Add section about AviSynth support

Conflicts:
doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Support older version of openjpeg1
Luca Barbato [Wed, 12 Mar 2014 09:30:07 +0000 (09:30 +0000)]
configure: Support older version of openjpeg1

It should work best for debian stable and people not installing the .pc
file.

(cherry picked from commit aa807425395caa17a85ed2833133278e8bd44a76)

5 years agodoc: Add section about AviSynth support
Stephen Hutchinson [Tue, 14 Jan 2014 14:49:29 +0000 (09:49 -0500)]
doc: Add section about AviSynth support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 908836e20743d7e9462011a9f30a300a5bf247ca)

5 years agoMerge remote-tracking branch 'qatar/release/10' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 12:14:56 +0000 (13:14 +0100)]
Merge remote-tracking branch 'qatar/release/10' into release/2.2

* qatar/release/10:
  lavf: always use av_free

See: 88c8e4afeaf74ee58b67145e0331e229d8050968
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 12:13:42 +0000 (13:13 +0100)]
Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2

* commit '6d56bc9a6d853a33fe53ab63db580c4facaba420':
  lavf: simplify ff_hevc_annexb2mp4_buf

Conflicts:
libavformat/hevc.c
libavformat/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 12:13:13 +0000 (13:13 +0100)]
Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2

* commit '2c5e1d0933facc20c6926a788cce05d3e6cad149':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

No change as the incorrect code wasnt in ffmpegs configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 12:12:41 +0000 (13:12 +0100)]
Merge commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa' into release/2.2

* commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa':
  hevc: Use get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d7ab09788bdafffb3f3fc4f7feb262eb8cdf0b1' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:16:27 +0000 (12:16 +0100)]
Merge commit '6d7ab09788bdafffb3f3fc4f7feb262eb8cdf0b1' into release/2.2

* commit '6d7ab09788bdafffb3f3fc4f7feb262eb8cdf0b1':
  golomb: Add a get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:16:05 +0000 (12:16 +0100)]
Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2

* commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb':
  vf_frei0r: adjust error messages

Conflicts:
libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '416847d19593e87ee1704c26a9a638fd6b0d977c' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:15:51 +0000 (12:15 +0100)]
Merge commit '416847d19593e87ee1704c26a9a638fd6b0d977c' into release/2.2

* commit '416847d19593e87ee1704c26a9a638fd6b0d977c':
  vf_frei0r: prevent a segfault when filter parameters are not set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:15:21 +0000 (12:15 +0100)]
Merge commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97' into release/2.2

* commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97':
  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 '6230de03aad9f26d5843afb913d196622e0b5b98' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:14:41 +0000 (12:14 +0100)]
Merge commit '6230de03aad9f26d5843afb913d196622e0b5b98' into release/2.2

* commit '6230de03aad9f26d5843afb913d196622e0b5b98':
  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>