ffmpeg.git
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 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>
5 years agoMerge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:09:13 +0000 (12:09 +0100)]
Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2

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

Conflicts:
libavutil/frame.h

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

* commit 'd37fac6dbbdddb76225aa691b83ffd9a0c7dae6b':
  isom: lpcm in mov default to big endian
  movdec: handle 0x7fff langcode as macintosh per the specs

No change as these have been part of the branch previously

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hevc: fix mix of av_malloc() with free()
Michael Niedermayer [Sun, 9 Mar 2014 22:27:31 +0000 (23:27 +0100)]
avformat/hevc: fix mix of av_malloc() with free()

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

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

* commit 'eabefe83f40a65d0f0c2a9a0521f6d96c3932545':
  movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hevc: Make return codes consistent and more flexible
Michael Niedermayer [Sun, 9 Mar 2014 22:12:45 +0000 (23:12 +0100)]
avformat/hevc: Make return codes consistent and more flexible

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 11:04:54 +0000 (12:04 +0100)]
Merge commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2' into release/2.2

* commit 'eaa79b79b25ac0ceaf44fe575a3ae724b87285b2':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: fix hevcs use of golomb from avformat
Michael Niedermayer [Sun, 9 Mar 2014 21:59:46 +0000 (22:59 +0100)]
avformat: fix hevcs use of golomb from avformat

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 10:48:10 +0000 (11:48 +0100)]
Merge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2

* commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c':
  movenc: write hvcC tag for HEVC.

Conflicts:
libavformat/Makefile

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

* commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 10:45:18 +0000 (11:45 +0100)]
Merge commit '1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4' into release/2.2

* commit '1c1e252cd1cbd5f59fe118c49f6d7207dbdfdbd4':
  movenc: Add a fallback fragmentation method for plain mp4 as well

Conflicts:
libavformat/movenc.c

See: ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 10:39:46 +0000 (11:39 +0100)]
Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2

* commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_ps.c

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

* commit 'fa6b99d351ed483766a875054676a56fd8459774':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
libavcodec/hevc.c

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

* commit 'd79cb6947e4a9c42ac20925dd920d3a0910d9a26':
  hevc: use av_mallocz() for allocating tab_ipm

See: 26568c04a8270ad792f3b86223914095b178b3a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5aa4b29bbefc06fc2bbcb52af7a14393a1bcf504' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 10:28:23 +0000 (11:28 +0100)]
Merge commit '5aa4b29bbefc06fc2bbcb52af7a14393a1bcf504' into release/2.2

* commit '5aa4b29bbefc06fc2bbcb52af7a14393a1bcf504':
  hevc: Use get_bits_long() in decode_vui()

See: e15a57b67a2600e2fa6db8e6c8485add305671d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 10:23:30 +0000 (11:23 +0100)]
Merge commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd' into release/2.2

* commit 'e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd':
  changelog: Cleanups and prepare for v10_beta2

Conflicts:
Changelog

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

* commit '0ede7b534483c5c90f404a8f11f776d2f2da4e7e':
  float_dsp: fix errors in documentation

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

* commit '5b933be089ab2657eb754ebf5b804ae43badf13d':
  arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

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

* commit 'f2693e98b449592ec0ed4979220814bf54e60a16':
  build: Use pkg-config for openjpeg

Conflicts:
configure

Not merged / merge just for metadata at request of carl

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

* commit 'c3861e14ceace7ee69820091871173b4abcae311':
  movenc: allow override of "writing application" tag

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

* commit 'daa5a988e2ec8275ad8b724ea68f78306c271ae7':
  matroskaenc: allow override of "writing application" tag

Conflicts:
libavformat/matroskaenc.c

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

* commit 'db67b7c31b6fdd3747e2b5328945ad2091533698':
  rv10: Forward error from rv10_decode_packet

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

* commit 'a643a47d41f4924b66fce339e4b82aaee20825be':
  fic: Properly handle skip frames

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

* commit '23af29e8825ac112877b9ac0572ef11e5f0539f2':
  arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '72a58c0772450993d375c6cf4b187a068f5bc765' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 09:49:37 +0000 (10:49 +0100)]
Merge commit '72a58c0772450993d375c6cf4b187a068f5bc765' into release/2.2

* commit '72a58c0772450993d375c6cf4b187a068f5bc765':
  Update default FATE URL for release/10

Conflicts:
tests/Makefile

Merge for metadata only as we dont duplicate the fate samples per release branch.
Theres no need for that currently

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd5254230068e196a2496618c0d89cdfbc41f7478' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 09:46:52 +0000 (10:46 +0100)]
Merge commit 'd5254230068e196a2496618c0d89cdfbc41f7478' into release/2.2

* commit 'd5254230068e196a2496618c0d89cdfbc41f7478':
  Revert "Add libx265 encoder"

Conflicts:
Changelog
LICENSE
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/libx265.c

Not merged, release branches should only contain bugfixes
a feature removial like this has to be discussed on ffmpeg-devel first

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4b476e6aa4b830f919cf3c67ba2caa039ff285b9' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 09:32:26 +0000 (10:32 +0100)]
Merge commit '4b476e6aa4b830f919cf3c67ba2caa039ff285b9' into release/2.2

* commit '4b476e6aa4b830f919cf3c67ba2caa039ff285b9':
  configure: enable PIC on s390(x)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1ab3300c83a16c2d5f5d29c51393668b9d92667' into release/2.2
Michael Niedermayer [Tue, 11 Mar 2014 09:31:47 +0000 (10:31 +0100)]
Merge commit 'a1ab3300c83a16c2d5f5d29c51393668b9d92667' into release/2.2

* commit 'a1ab3300c83a16c2d5f5d29c51393668b9d92667':
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "lavu/buffer: add release function"
Lukasz Marek [Sun, 2 Mar 2014 16:47:19 +0000 (17:47 +0100)]
Revert "lavu/buffer: add release function"

This reverts commit 3144440004941aa22ffea9933f5e5dfe826df654.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: always use av_free
Michael Niedermayer [Mon, 10 Mar 2014 15:03:14 +0000 (15:03 +0000)]
lavf: always use av_free

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

5 years agolavf: simplify ff_hevc_annexb2mp4_buf
Tim Walker [Mon, 10 Mar 2014 15:03:13 +0000 (15:03 +0000)]
lavf: simplify ff_hevc_annexb2mp4_buf

Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

(cherry picked from commit 34bbc81de8a49fbddb92b76dc733f40890480b2b)

5 years agoconfigure: Use the right pkgconf file for openjpeg
Luca Barbato [Mon, 10 Mar 2014 10:48:04 +0000 (11:48 +0100)]
configure: Use the right pkgconf file for openjpeg

The current release of version 1 uses libopenjpeg1.

(cherry picked from commit 4a8562394b685e83ae4a38a93eef43625755a231)

5 years agohevc: Use get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:59:48 +0000 (10:59 +0100)]
hevc: Use get_se_golomb_long

Do not use inline functions that refer to tables present in other
libraries.

(cherry picked from commit ee17be3fdd37f63f4b77676820e387858908b0f4)

5 years agogolomb: Add a get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:57:51 +0000 (10:57 +0100)]
golomb: Add a get_se_golomb_long

Useful in libavformat mostly.

(cherry picked from commit 5eacbb53289570834f9a1acb15fd406ea224eef6)

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

(cherry picked from commit 8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9)

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

(cherry picked from commit 4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e)

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.

(cherry picked from commit 4c41a7a1798dd6c60e40f79be12faa98a9347151)

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.

(cherry picked from commit 61b323ce7c7cdc101eadfd7de2203922b8a39e8d)

5 years agodoc: fix a couple of typos in frame.h
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
doc: fix a couple of typos in frame.h

(cherry picked from commit a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54)

5 years agoisom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
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>
(cherry picked from commit 360022bd3b894cc01ea112b275fa4c8f53881808)

5 years agomovdec: handle 0x7fff langcode as macintosh per the specs
Baptiste Coudurier [Wed, 21 Mar 2012 21:18:16 +0000 (14:18 -0700)]
movdec: handle 0x7fff langcode as macintosh per the specs

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

(cherry picked from commit 9e71cc81f3655cacf0f91860fba3043f13b64059)

5 years agomovenc: allow muxing HEVC in MODE_MP4.
Tim Walker [Mon, 3 Mar 2014 14:53:43 +0000 (14:53 +0000)]
movenc: allow muxing HEVC in MODE_MP4.

(cherry picked from commit 4f3db5d3418a24f3b90422e98ad75388052c4284)

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

(cherry picked from commit b6c61fb83e876d404ac3b0b3657ebfcafdcd1926)

5 years agomovenc: write hvcC tag for HEVC.
Tim Walker [Mon, 3 Mar 2014 14:53:41 +0000 (14:53 +0000)]
movenc: write hvcC tag for HEVC.

(cherry picked from commit 20b40a597cdd4969cf1147d7c7efee2b6232524b)

5 years agomovenc: use 'hev1' tag for HEVC in MODE_MOV.
Tim Walker [Mon, 3 Mar 2014 14:53:40 +0000 (14:53 +0000)]
movenc: use 'hev1' tag for HEVC in MODE_MOV.

'hvc1' requires that parameter set NAL units be
present only in the samples entry, but not in the
samples themselves, requiring that additional
parameter sets, if present, be filtered out of the
samples and placed in new, additional sample entries
if they override or otherwise conflict with the
parameter sets present in the first sample entry.
We do not have any way of doing this at present, so
the files we produce can only comply with the
restrictions set for the 'hev1' sample entry name in
ISO/IEC 14496-15.

(cherry picked from commit 1d9014f0b008485eac4c19d5f5e11ede59237167)

5 years agomovenc: Add a fallback fragmentation method for plain mp4 as well
Martin Storsjö [Tue, 18 Feb 2014 14:11:59 +0000 (16:11 +0200)]
movenc: Add a fallback fragmentation method for plain mp4 as well

Previously the default fragmentation method was only enabled
if writing an ISM file.

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

5 years agohevc: make pps/sps ids unsigned where necessary
Vittorio Giovara [Sun, 9 Mar 2014 16:15:26 +0000 (17:15 +0100)]
hevc: make pps/sps ids unsigned where necessary

Fixes integer overflow and out of array accesses.
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
(cherry picked from commit 4d33873c2990b8d6096f60fef384f0efc4482b55)

5 years agohevc: Do not turn 32bit timebases into negative numbers
Michael Niedermayer [Sat, 15 Feb 2014 22:09:55 +0000 (23:09 +0100)]
hevc: Do not turn 32bit timebases into negative numbers

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit ed06e5d92b4c67b49068d538461fbbe0a53a8c5e)

5 years agohevc: use av_mallocz() for allocating tab_ipm
Michael Niedermayer [Sat, 11 Jan 2014 19:23:51 +0000 (20:23 +0100)]
hevc: use av_mallocz() for allocating tab_ipm

Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 6cc94e971933cd38c452172bb048bf760e65cc3e)

5 years agohevc: Use get_bits_long() in decode_vui()
Michael Niedermayer [Sat, 15 Feb 2014 21:29:17 +0000 (22:29 +0100)]
hevc: Use get_bits_long() in decode_vui()

Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 920c01adce6c273fc043513ff237a6266e612152)

5 years agochangelog: Cleanups and prepare for v10_beta2
Reinhard Tartler [Sun, 9 Mar 2014 01:50:36 +0000 (20:50 -0500)]
changelog: Cleanups and prepare for v10_beta2

5 years agofloat_dsp: fix errors in documentation
Janne Grunau [Sun, 2 Mar 2014 19:33:49 +0000 (20:33 +0100)]
float_dsp: fix errors in documentation

(cherry picked from commit 74cc901905741ca3d9e8364f42239341f4f173c4)

5 years agoarm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Janne Grunau [Sat, 8 Mar 2014 18:15:16 +0000 (19:15 +0100)]
arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating
clear_blocks into the idct.

(cherry picked from commit 4506a854a4d846692ba71daeeff661dc214c8fa2)

5 years agobuild: Use pkg-config for openjpeg
Pierre Lejeune [Sat, 8 Mar 2014 12:19:17 +0000 (12:19 +0000)]
build: Use pkg-config for openjpeg

Bug-Id: 387
CC: libav-stable@libav.org
(cherry picked from commit 0e0cefb22216a4b6684a30a50cb5973400dc59f2)

5 years agomovenc: allow override of "writing application" tag
John Stebbins [Mon, 3 Mar 2014 20:20:15 +0000 (20:20 +0000)]
movenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
(cherry picked from commit 565e0c6d866ce08d4b06427456d3d1f4fd856e9c)

5 years agomatroskaenc: allow override of "writing application" tag
John Stebbins [Mon, 3 Mar 2014 20:20:14 +0000 (20:20 +0000)]
matroskaenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
(cherry picked from commit 0092c1dd8dac2d9e185b58503b447a0d3fb5230d)

5 years agorv10: Forward error from rv10_decode_packet
Keiji Costantini [Sat, 1 Mar 2014 18:44:00 +0000 (19:44 +0100)]
rv10: Forward error from rv10_decode_packet

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

5 years agofic: Properly handle skip frames
Derek Buitenhuis [Fri, 7 Mar 2014 14:31:53 +0000 (14:31 +0000)]
fic: Properly handle skip frames

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
(cherry picked from commit f87a6e500bcdaede22a123b81a2a46779cf7b71a)

5 years agoarm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

5 years agolavfi/af_atempo: clear references before returning error.
Nicolas George [Wed, 5 Mar 2014 16:59:38 +0000 (17:59 +0100)]
lavfi/af_atempo: clear references before returning error.

Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.
(cherry picked from commit bc6901c94944e4a81be49a6b11183cd0c55d2738)

5 years agoUpdate default FATE URL for release/10
Reinhard Tartler [Fri, 7 Mar 2014 02:00:26 +0000 (21:00 -0500)]
Update default FATE URL for release/10

5 years agoRevert "Add libx265 encoder"
Reinhard Tartler [Fri, 7 Mar 2014 00:55:48 +0000 (19:55 -0500)]
Revert "Add libx265 encoder"

cf. the discussion following
https://lists.libav.org/pipermail/libav-devel/2014-March/056894.html

This reverts commit 50ea93158d4c480f64069e8bd1da388486dcf4ba.

Conflicts:
doc/general.texi
libavcodec/version.h

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
(cherry picked from commit 5ddc9f5052316608799b932c604f9e7561f8ce24)

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>
(cherry picked from commit 12b97dd375736c332989c50ea68af9d834b2621f)

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 agoMerge remote-tracking branch 'qatar/release/10' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 22:39:42 +0000 (23:39 +0100)]
Merge remote-tracking branch 'qatar/release/10' into release/2.2

* qatar/release/10:
  ituh263: reject b-frame with pp_time = 0
  af_compand: replace strtok_r() with av_get_token()
  latm: Always reconfigure if no extradata was set previously
  af_compand: add a dependency on strtok_r
  lavfi: add compand audio filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 22:30:47 +0000 (23:30 +0100)]
Merge commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4' into release/2.2

* commit '596d3e20ae69a278d562eea08f5e8c0ae5a5bfc4':
  parser: cosmetics: Drop some unnecessary parentheses
  parser: K&R formatting cosmetics
  parser: Remove commented-out cruft
  doc: name correct header
  af_volume: preserve frame properties

Conflicts:
doc/APIchanges
libavcodec/parser.c
libavfilter/af_volume.c

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7933039ade01b39638ec3d9e638b6ae06ee84984' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 22:16:15 +0000 (23:16 +0100)]
Merge commit '7933039ade01b39638ec3d9e638b6ae06ee84984' into release/2.2

* commit '7933039ade01b39638ec3d9e638b6ae06ee84984':
  af_resample: preserve frame properties
  avconv: Do not divide by zero
  dca: replace some memcpy by AV_COPY128
  h264: avoid undefined behavior in chroma motion compensation
  x86: dsputil: Use correct file name as multiple inclusion guard

Conflicts:
ffmpeg.c

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4015829accc2382393d42d62654eb96d896d1326' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 22:00:55 +0000 (23:00 +0100)]
Merge commit '4015829accc2382393d42d62654eb96d896d1326' into release/2.2

* commit '4015829accc2382393d42d62654eb96d896d1326':
  bit_depth_template: Use file name as multiple inclusion guard
  svq3: Adjust #endif comment
  hevc: Mention the missing SPS in the error message
  doc: Name the MOV muxer as it should be called
  doc: Sort the muxer documentation

Conflicts:
doc/muxers.texi

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 21:53:25 +0000 (22:53 +0100)]
Merge commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d' into release/2.2

* commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d':
  x86: dca: Add missing multiple inclusion guards
  gitignore: Add all examples below doc/examples
  arm: Mark the stack as non-executable
  doxygen: Replace @parblock syntax with manual linebreaks
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
.gitignore
libavformat/avformat.h

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 21:39:08 +0000 (22:39 +0100)]
Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2

* commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35':
  qt-faststart: Add a note about the -movflags +faststart feature
  qt-faststart: Avoid unintentionally sign extending BE_32
  qt-faststart: Check offset_count before reading from the moov_atom buffer
  qt-faststart: Check the ftello() return codes
  qt-faststart: Fix the signedness of variables keeping the ftello return values
  qt-faststart: Check fseeko() return codes
  qt-faststart: Simplify code by using a MIN() macro
  qt-faststart: Increase the copy buffer size to 64 KB

Conflicts:
tools/qt-faststart.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1d1df82093fdacb2cbc443c70c80f8f801002d28' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 21:30:42 +0000 (22:30 +0100)]
Merge commit '1d1df82093fdacb2cbc443c70c80f8f801002d28' into release/2.2

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'de187e3e9ec4803575deb1c293ccad84d2a88da8' into release/2.2
Michael Niedermayer [Mon, 3 Mar 2014 21:21:14 +0000 (22:21 +0100)]
Merge commit 'de187e3e9ec4803575deb1c293ccad84d2a88da8' into release/2.2

* commit 'de187e3e9ec4803575deb1c293ccad84d2a88da8':
  h264: Fix a typo from the previous commit
  h264: Lower bound check for slice offsets
  hevc: Always consider VLC NALU type mismatch fatal
  Prepare for 10_beta2 Release
  build: The MPEG-4 video parser depends on h263dsp

Conflicts:
RELEASE
configure

All changes are already in our 2.2 branch, this is just for metadata

Merged-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>
(cherry picked from commit 9514440337875e0c63b409abcd616b68c518283f)

5 years agoparser: cosmetics: Drop some unnecessary parentheses
Diego Biurrun [Tue, 25 Feb 2014 11:21:15 +0000 (12:21 +0100)]
parser: cosmetics: Drop some unnecessary parentheses

(cherry picked from commit 4ec336484d638b6b009636f465352c61a5a57061)

5 years agoaf_compand: replace strtok_r() with av_get_token()
Anton Khirnov [Wed, 26 Feb 2014 21:37:06 +0000 (22:37 +0100)]
af_compand: replace strtok_r() with av_get_token()

(cherry picked from commit bc6461c2861b7d482a037d3b3e2b44ad48805fa0)

5 years agoparser: K&R formatting cosmetics
Luca Barbato [Sun, 23 Feb 2014 22:59:25 +0000 (23:59 +0100)]
parser: K&R formatting cosmetics

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

5 years agolatm: Always reconfigure if no extradata was set previously
Hendrik Leppkes [Thu, 22 Dec 2011 23:14:32 +0000 (00:14 +0100)]
latm: Always reconfigure if no extradata was set previously

AAC LOAS can have new audio config objects in the stream itself.

Make sure the decoder reconfigures itself when the first one arrives
midstream.

Bug-Id: 644
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 3aca10bf762a94d7de555cedf1ff0e4f6792bf41)

5 years agoparser: Remove commented-out cruft
Diego Biurrun [Tue, 25 Feb 2014 10:59:05 +0000 (11:59 +0100)]
parser: Remove commented-out cruft

(cherry picked from commit ed61f3ca8a0664a697782253b354055136c5d303)

5 years agoaf_compand: add a dependency on strtok_r
Anton Khirnov [Wed, 26 Feb 2014 12:44:53 +0000 (13:44 +0100)]
af_compand: add a dependency on strtok_r

(cherry picked from commit 291e49d4e7db4b982621d7a25e258f898cfc3217)

5 years agodoc: name correct header
Vittorio Giovara [Mon, 24 Feb 2014 15:59:40 +0000 (16:59 +0100)]
doc: name correct header

(cherry picked from commit 48d1ed9c83ee0c388e8c2898e81ffb4add509ab9)

5 years agolavfi: add compand audio filter
Andrew Kelley [Wed, 26 Feb 2014 06:47:40 +0000 (01:47 -0500)]
lavfi: add compand audio filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 738f83582a3aaabb81309eacd4ab9c3d2acb4071)

Conflicts:
libavfilter/version.h