ffmpeg.git
6 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>
6 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>
6 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

6 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)

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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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)

6 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)

6 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)

6 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.

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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>
6 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.

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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)

6 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)

6 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)

6 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

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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)

6 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)

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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)