ffmpeg.git
5 years agoMerge commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:39:17 +0000 (02:39 +0100)]
Merge commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4' into release/2.4

* commit 'dd195c2c587f44dbc4be7f059ed182f7d83e6cb4':
  on2avc: Fix out of array access

See: ce6a1ff2a124b3b0e8530bca1b6eed5a368feb5a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:38:24 +0000 (02:38 +0100)]
Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4

* commit '29e720da76ca353dbda9f881562902b41c355b77':
  librtmp: append the correct field to the string

See: d1970929b5f8b873aac171586343c9d8142897ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/librtmp: fix swfurl
Michael Niedermayer [Sun, 9 Nov 2014 11:36:23 +0000 (12:36 +0100)]
avformat/librtmp: fix swfurl

Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1970929b5f8b873aac171586343c9d8142897ad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:34:25 +0000 (02:34 +0100)]
Merge commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba' into release/2.4

* commit '61fdbf7ff64c0ae1bdd6a8d573092dc6924c1dba':
  lavc: fix bitshifts amount bigger than the type

Conflicts:
libavcodec/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:27:17 +0000 (02:27 +0100)]
Merge commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262' into release/2.4

* commit '93bf4a74de99300fdc0deb83f672bf12e6f1c262':
  configure: Fix enabling memalign_hack automatically

Conflicts:
configure

See: 3d93ba562243b6d8afac3c875c05304d41da94bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:26:41 +0000 (02:26 +0100)]
Merge commit '527617485914004dc8b772056322ea5ae74c800d' into release/2.4

* commit '527617485914004dc8b772056322ea5ae74c800d':
  lavc: Move the libtwolame encoder registration to the list for external libraries

Conflicts:
libavcodec/allcodecs.c

See: f5f98727b361c62d3962cef37a100db95d62b702
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:25:52 +0000 (02:25 +0100)]
Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4

* commit '32701252af65014bb68194bb61d67ec1882ae75d':
  xwma: Do not leak on failure path

Conflicts:
libavformat/xwma.c

See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d11e4b47db6387077682595d53e9a17b50511cb' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:25:08 +0000 (02:25 +0100)]
Merge commit '4d11e4b47db6387077682595d53e9a17b50511cb' into release/2.4

* commit '4d11e4b47db6387077682595d53e9a17b50511cb':
  libtwolame: prevent a NULL pointer dereference

See: a586b3d9b1df9099c18d3e15c9b261f6612ad2ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/libtwolame: fix null pointer dereference
Paul B Mahol [Mon, 13 Oct 2014 12:22:41 +0000 (12:22 +0000)]
libavcodec/libtwolame: fix null pointer dereference

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit a586b3d9b1df9099c18d3e15c9b261f6612ad2ac)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:14:57 +0000 (02:14 +0100)]
Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4

* commit '5891fd017aa7bed4c423b8511090cf8641a0afa4':
  dvdsubdec: Do not leak on failure path

Conflicts:
libavcodec/dvdsubdec.c

See: 7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:14:19 +0000 (02:14 +0100)]
Merge commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0' into release/2.4

* commit 'e9aeaa6441f6fd18fc951d9737887dcf8a9584c0':
  qdm2: avoid integer overflow

See: ccfd8cffe867d534447dbc5beb96ff39e65e2791
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cce99f72d1b49d3dfee859136eeff3db32553750' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:13:32 +0000 (02:13 +0100)]
Merge commit 'cce99f72d1b49d3dfee859136eeff3db32553750' into release/2.4

* commit 'cce99f72d1b49d3dfee859136eeff3db32553750':
  mpegenc: prevent a NULL pointer dereference

See: 010adacbe2363a5f98d62db8fae7b0009552b801
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:12:58 +0000 (02:12 +0100)]
Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4

* commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea':
  aacdec: avoid an out-of-bounds write

Conflicts:
libavcodec/aacdec.c

See: ba02069a8e22985a9a775dac9ece6dc54a7e8b44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:01:50 +0000 (02:01 +0100)]
Merge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4

* commit '484e015dc8b9983297e9269b406c65084daf4528':
  cook: Make sure there is enough extradata

See: c9e455432988acd414990ba92f782b8e3c4b6aea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:00:54 +0000 (02:00 +0100)]
Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4

* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
  tiffenc: initialize return value

Conflicts:
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 01:00:00 +0000 (02:00 +0100)]
Merge commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b' into release/2.4

* commit '12e1a7013a53ad957c4ff11a3aebc0763024d24b':
  roqaudio: Always use the frame buffer on flush

Conflicts:
libavcodec/roqaudioenc.c

See: a1af505d6640a89401f8e9941a38352a1ca49d58
See: c0b17ea106b94f79255f81ec36ea50096e1ae985
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:59:25 +0000 (01:59 +0100)]
Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4

* commit 'e7ee74485b436c34591177c18c8643764a55d516':
  hnm4: Use av_image_check_size

See: e23b18321fb5cffb6e05d0b0ef00de9733f560da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:42:09 +0000 (01:42 +0100)]
Merge commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960' into release/2.4

* commit '4edbb0955e043d698dcc1b5073b6e714f9cc7960':
  png_parser: fix size of chunk_lenght

Conflicts:
libavcodec/png_parser.c

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:41:16 +0000 (01:41 +0100)]
Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4

* commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
libavcodec/aacsbr.c

See: c2340831b8e9032716acb0aab4893d3cc500213a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:40:31 +0000 (01:40 +0100)]
Merge commit '34e7f70f9f493f340daab80eba4f12d005ec3e63' into release/2.4

* commit '34e7f70f9f493f340daab80eba4f12d005ec3e63':
  assdec: check av_new_packet return value

Conflicts:
libavformat/assdec.c

See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:39:47 +0000 (01:39 +0100)]
Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4

* commit '242fc6394fecb403bcbd0f652920f2647d0b08ae':
  mtv: improve header check and avoid division by zero

Conflicts:
libavformat/mtv.c

See: 8b9b6332dfeb169098c8ab1351d66fc5b474dd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:33:20 +0000 (01:33 +0100)]
Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4

* commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515':
  matroskaenc: write correct Display{Width, Height} in stereo encoding

Conflicts:
libavformat/matroskaenc.c

See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:29:55 +0000 (01:29 +0100)]
Merge commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8' into release/2.4

* commit '26ba78adacd8469fca97c8c833e2e6364b13b7c8':
  mov: fix assigment check

Conflicts:
libavformat/mov.c

See: af2e5061bbcabf5eae780929fa25784b6127759e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8a982092cc3436c25d68ec15b27277c176ce0061' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:29:13 +0000 (01:29 +0100)]
Merge commit '8a982092cc3436c25d68ec15b27277c176ce0061' into release/2.4

* commit '8a982092cc3436c25d68ec15b27277c176ce0061':
  mxfdec: add missing break

See: cbda76c7c65c5c0a4d5de03baad96c4a940c7336
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:22:14 +0000 (01:22 +0100)]
Merge commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58' into release/2.4

* commit '19fc283dbb53a5f7d6658fd4edcfa59b99369b58':
  lavf: replace rename() with ff_rename()

Conflicts:
libavformat/hdsenc.c
libavformat/internal.h

See: 95d2fc6a76f3e0a98329f1ca70f98e7c085f0abf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:19:35 +0000 (01:19 +0100)]
Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4

* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
  img2dec: check av_new_packet return value

Conflicts:
libavformat/img2dec.c

See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:18:49 +0000 (01:18 +0100)]
Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4

* commit '7c710c38f6481b892e01d3c1e4781ad160b2935e':
  audiointerleave: check av_new_packet return value

Conflicts:
libavformat/audiointerleave.c

See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:11:20 +0000 (01:11 +0100)]
Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4

* commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0':
  avfilter: check filter link validity

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:10:43 +0000 (01:10 +0100)]
Merge commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5' into release/2.4

* commit '556a5090f2b0a20fd9998e1a327875f5b0c8d1d5':
  mp3dec: fix reading the Xing tag

Conflicts:
libavformat/mp3dec.c

See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:09:57 +0000 (01:09 +0100)]
Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4

* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
  nutdec: check av_new_packet return value

Conflicts:
libavformat/nutdec.c

See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:03:58 +0000 (01:03 +0100)]
Merge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4

* commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8':
  rmdec: check av_new_packet return value

Conflicts:
libavformat/rmdec.c

See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:03:06 +0000 (01:03 +0100)]
Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4

* commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782':
  vf_format: check input validity

See: ee16e0cacc16ea60c35a66796410012755263c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:02:25 +0000 (01:02 +0100)]
Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4

* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
  aviobuf: check context before using it

See: 7441d1ec330da810a0ffd44a02b2fc60add5b719
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5aceced0a0d235d485e88fda502019b221dbf3d2' into release/2.4
Michael Niedermayer [Sun, 18 Jan 2015 00:01:42 +0000 (01:01 +0100)]
Merge commit '5aceced0a0d235d485e88fda502019b221dbf3d2' into release/2.4

* commit '5aceced0a0d235d485e88fda502019b221dbf3d2':
  avio: fix sizeof argument

See: a96577df38469e5075caa416d3374576d9ab64ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:51:06 +0000 (00:51 +0100)]
Merge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4

* commit '27487944eff721ef8e310db1a2a52329d9377f71':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
libswscale/rgb2rgb_template.c

See: a07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5
See: a30972609ca39b791ce1e4e5cc6c3dd6cb9c9b12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:50:19 +0000 (00:50 +0100)]
Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4

* commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2':
  oss_audio: use a macro to simplify ioctl() error checking

Conflicts:
libavdevice/oss_audio.c

See: 69c7aad494683953e833e8622776e3bbcc7921ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:49:47 +0000 (00:49 +0100)]
Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4

* commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409':
  avresample: Make sure the even check does not overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:49:07 +0000 (00:49 +0100)]
Merge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4

* commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47':
  af_resample: check av_opt_set_dict return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:40:50 +0000 (00:40 +0100)]
Merge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4

* commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
libavfilter/vf_showinfo.c

See: 2aecfd4f209688a8365f18b351f0ecf12fe5f873
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '608e8d8dd754199b657b439f9e722e0b45f84461' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:39:59 +0000 (00:39 +0100)]
Merge commit '608e8d8dd754199b657b439f9e722e0b45f84461' into release/2.4

* commit '608e8d8dd754199b657b439f9e722e0b45f84461':
  vf_drawtext: Do not leak the mmapped textfile

Conflicts:
libavfilter/vf_drawtext.c

See: 6956b048d8198dce5126c8942dece21cfb1a7978
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:38:31 +0000 (00:38 +0100)]
Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4

* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
  cmdutils: Use the correct guard

Conflicts:
cmdutils.c

See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:37:41 +0000 (00:37 +0100)]
Merge commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65' into release/2.4

* commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65':
  avformat: Make avformat_free_context handle NULL

See: ee23dcf534801931c13f9f534586b56e231d3085
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:30:40 +0000 (00:30 +0100)]
Merge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4

* commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc':
  rtsp: Check a memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
Michael Niedermayer [Fri, 5 Dec 2014 23:18:29 +0000 (00:18 +0100)]
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: rm_read_extradata: add error message for oversized extradata
Michael Niedermayer [Fri, 5 Dec 2014 23:17:30 +0000 (00:17 +0100)]
avformat/rmdec: rm_read_extradata: add error message for oversized extradata

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:24:57 +0000 (00:24 +0100)]
Merge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4

* commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065':
  rm: Use the correct codec_data_size signedness

Conflicts:
libavformat/rm.h
libavformat/rmdec.c

See: a6f730730b82645a9d31aad0968487cb77d6946c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:24:03 +0000 (00:24 +0100)]
Merge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4

* commit 'da35008c314eae5a10a8c070f5185b7694c0a37e':
  latm: Do not give a score for a single instance

Conflicts:
libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: do not count PES packets inside PES packets during probing
Michael Niedermayer [Sat, 6 Dec 2014 21:33:09 +0000 (22:33 +0100)]
avformat/mpeg: do not count PES packets inside PES packets during probing

Fixes: misdetection of test2.mp3

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4baee1124b905cbd75240530e081c8ffa68fddbe' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:06:38 +0000 (00:06 +0100)]
Merge commit '4baee1124b905cbd75240530e081c8ffa68fddbe' into release/2.4

* commit '4baee1124b905cbd75240530e081c8ffa68fddbe':
  mp3: Tweak the probe scores

Conflicts:
libavformat/mp3dec.c

See: ef79bbeddd432deaf3e8316da7e5a075816108b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:06:00 +0000 (00:06 +0100)]
Merge commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e' into release/2.4

* commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e':
  vf_frei0r: do not increment string if it reached the end

See: 02a6ee51685eb74f7a878dd49553ecc1f8da9fb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 23:05:04 +0000 (00:05 +0100)]
Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4

* commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4':
  svq1dec: Unbreak the scratch buffer allocation

Conflicts:
libavcodec/svq1dec.c

See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:57:50 +0000 (23:57 +0100)]
Merge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4

* commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
libavcodec/vaapi.c

See: f2118d44c9f18b3245bec2415c563d94201dcf5a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:56:07 +0000 (23:56 +0100)]
Merge commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11' into release/2.4

* commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11':
  hevc: always clip luma_log2_weight_denom

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '23fe589e19487bc9a40b77dae9509068da5b14b8' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:55:12 +0000 (23:55 +0100)]
Merge commit '23fe589e19487bc9a40b77dae9509068da5b14b8' into release/2.4

* commit '23fe589e19487bc9a40b77dae9509068da5b14b8':
  prores: Evaluate all the quantizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:25:27 +0000 (23:25 +0100)]
Merge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4

* commit '9bd4561d74a46dd6557140e286228e09e380674c':
  tiff: Check the check_size() return value and forward it

Conflicts:
libavcodec/tiffenc.c

See: d50aa006fb3430bedc3872ba10e028a714499625
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:23:27 +0000 (23:23 +0100)]
Merge commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09' into release/2.4

* commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09':
  rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '21683549edf436024cc3efbc4f8d1d55221c5336' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:22:41 +0000 (23:22 +0100)]
Merge commit '21683549edf436024cc3efbc4f8d1d55221c5336' into release/2.4

* commit '21683549edf436024cc3efbc4f8d1d55221c5336':
  h261dec: Fix context initialization sequence

See: 6c1ee1a11446abbe662fc89b9dff0f0a3d5fdd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:14:06 +0000 (23:14 +0100)]
Merge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4

* commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e':
  cmdutils: check file access functions return values

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:08:10 +0000 (23:08 +0100)]
Merge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4

* commit '1411f073fdceeff1f39dbaa035c3c0275f69095f':
  aacenc: correctly check returned value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '76e9a17f3392e752193015765e9216c2f0716b96' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:07:18 +0000 (23:07 +0100)]
Merge commit '76e9a17f3392e752193015765e9216c2f0716b96' into release/2.4

* commit '76e9a17f3392e752193015765e9216c2f0716b96':
  lavfi: always check av_expr_parse_and_eval() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:01:17 +0000 (23:01 +0100)]
Merge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4

* commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304':
  xsub: Support DXSA subtitles

Conflicts:
libavcodec/xsubdec.c

See: d6f910ea47255b519e0b71c33d74c409a29ab3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 22:00:16 +0000 (23:00 +0100)]
Merge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4

* commit 'bfe18be88a66da25b60a091de6011197dcb231fd':
  mpeg4audio: check the init_get_bits() return value

Conflicts:
libavcodec/mpeg4audio.c

See: deefdf9788467edd262b9c29a4f6e33d2ae84b8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 21:56:52 +0000 (22:56 +0100)]
Merge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4

* commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05':
  segment: Fix the failure paths

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 21:47:02 +0000 (22:47 +0100)]
Merge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4

* commit '3280b86c85f5a88397fce0230d1878fee79fbb93':
  swscale: check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 21:43:37 +0000 (22:43 +0100)]
Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4

* commit '61335ab33e594d47b84fde7367ee10dc66fc3465':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5' into release/2.4
Michael Niedermayer [Sat, 17 Jan 2015 21:39:39 +0000 (22:39 +0100)]
Merge commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5' into release/2.4

* commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5':
  libavformat: Check for malloc failures in avformat_new_stream

See: a66893ac949864352b36b39e48c4cd72bbd81e54
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: check for malloc failure
wm4 [Fri, 12 Dec 2014 21:22:55 +0000 (22:22 +0100)]
avformat/utils: check for malloc failure

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoUpdate for 2.4.6 n2.4.6
Michael Niedermayer [Tue, 13 Jan 2015 16:14:46 +0000 (17:14 +0100)]
Update for 2.4.6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoon2avc: Fix out of array access
Michael Niedermayer [Wed, 12 Nov 2014 10:13:01 +0000 (11:13 +0100)]
on2avc: Fix out of array access

CC: libav-stable@libav.org
Bug-Id: CID 1206648
(cherry picked from commit 2fa6d21124bd2fc0b186290f5313179263bfcfb7)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolibrtmp: append the correct field to the string
Vittorio Giovara [Sun, 16 Nov 2014 23:22:22 +0000 (00:22 +0100)]
librtmp: append the correct field to the string

Also prevent a NULL pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1250329 / CID 1250331
(cherry picked from commit a28468d0daf4be14761c16a3ddd33266b2380123)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolavc: fix bitshifts amount bigger than the type
Vittorio Giovara [Sun, 16 Nov 2014 23:22:27 +0000 (00:22 +0100)]
lavc: fix bitshifts amount bigger than the type

CC: libav-stable@libav.org
Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638
(cherry picked from commit 85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoconfigure: Fix enabling memalign_hack automatically
Martin Storsjö [Tue, 18 Nov 2014 11:52:26 +0000 (13:52 +0200)]
configure: Fix enabling memalign_hack automatically

simd_align_16 is a configure item that can be enabled or disabled,
it's not a variable containing a list of other configure items
as need_memalign previously. This was broken in eba2233b5.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 7813e6752bdab38a5686c301e869ee71d97bce69)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolavc: Move the libtwolame encoder registration to the list for external libraries
Martin Storsjö [Fri, 21 Nov 2014 12:23:02 +0000 (14:23 +0200)]
lavc: Move the libtwolame encoder registration to the list for external libraries

This makes sure the default behaviour of using the internal encoder
stays the same regardless if libtwolame is enabled or not (as for
any external library).

This fixes fate-lavf-mpg if libav is built with libtwolame enabled.

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
(cherry picked from commit aa8b39d999589154f79300de9038994d0093cd34)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoxwma: Do not leak on failure path
Luca Barbato [Sun, 16 Nov 2014 23:22:21 +0000 (00:22 +0100)]
xwma: Do not leak on failure path

CC: libav-stable@libav.org
Bug-Id: CID 1087092
(cherry picked from commit fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agolibtwolame: prevent a NULL pointer dereference
Vittorio Giovara [Fri, 21 Nov 2014 11:56:59 +0000 (11:56 +0000)]
libtwolame: prevent a NULL pointer dereference

CC: libav-stable@libav.org
Bug-Id: CID 1250330 / CID 1250335
(cherry picked from commit a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agodvdsubdec: Do not leak on failure path
Luca Barbato [Sun, 9 Nov 2014 07:48:47 +0000 (08:48 +0100)]
dvdsubdec: Do not leak on failure path

CC: libav-stable@libav.org
Bug-Id: CID 1198262
(cherry picked from commit d466d82faaf6e0e57a3a4be5e38e3902ef251ac3)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoqdm2: avoid integer overflow
Vittorio Giovara [Wed, 12 Nov 2014 18:10:44 +0000 (19:10 +0100)]
qdm2: avoid integer overflow

CC: libav-stable@libav.org
Bug-Id: CID 700555
(cherry picked from commit 1f80742f49a9a4e846c9f099387881abc87150b2)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agompegenc: prevent a NULL pointer dereference
Vittorio Giovara [Fri, 21 Nov 2014 12:57:42 +0000 (12:57 +0000)]
mpegenc: prevent a NULL pointer dereference

CC: libav-stable@libav.org
Bug-Id: CID 29261
(cherry picked from commit 065923b0781b06a2604f69f4e2c2407b7750a854)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoaacdec: avoid an out-of-bounds write
Vittorio Giovara [Fri, 21 Nov 2014 12:57:40 +0000 (12:57 +0000)]
aacdec: avoid an out-of-bounds write

Also move the check in the case it is actually used.

CC: libav-stable@libav.org
Bug-Id: CID 1087090
(cherry picked from commit b99ca863506f0630514921b740b78364de67a3ff)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agocook: Make sure there is enough extradata
Luca Barbato [Sun, 23 Nov 2014 15:09:05 +0000 (16:09 +0100)]
cook: Make sure there is enough extradata

At least 8 bytes are needed (Mono audio).

Bug-Id: CID 741418
CC: libav-stable@libav.org
(cherry picked from commit 299d8ab104fb350254eb2e6d9ecdce892a2a55b1)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agotiffenc: initialize return value
Vittorio Giovara [Sun, 9 Nov 2014 07:48:43 +0000 (08:48 +0100)]
tiffenc: initialize return value

'ret' can only be used without initialization if s->height <= 0, which can
only happen if avctx->height <= 0, which is validated elsewhere. Doesn't hurt
to still initialize it though.

CC: libav-stable@libav.org
Bug-Id: CID 732296
(cherry picked from commit 0562887a984388fdc7a9b71c9374ff9c756fb4f1)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoroqaudio: Always use the frame buffer on flush
Michael Niedermayer [Wed, 12 Nov 2014 10:13:10 +0000 (11:13 +0100)]
roqaudio: Always use the frame buffer on flush

Prevent NULL dereference.

CC: libav-stable@libav.org
Bug-Id: CID 703669
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
(cherry picked from commit 55b59fab880a9fcdd30f97c5170af282087ac4f7)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agohnm4: Use av_image_check_size
Luca Barbato [Mon, 24 Nov 2014 00:04:39 +0000 (01:04 +0100)]
hnm4: Use av_image_check_size

As done for all the other codecs not calling it indirectly.

CC: libav-stable@libav.org
Bug-Id: CID 1135770 / CID 1135771

5 years agopng_parser: fix size of chunk_lenght
Vittorio Giovara [Sun, 9 Nov 2014 07:48:35 +0000 (08:48 +0100)]
png_parser: fix size of chunk_lenght

Fixes the comparison against constant value 0x7fffffff.

CC: libav-stable@libav.org
Bug-Id: CID 1198260

5 years agoaacsbr: change order of operation to prevent out of array read
Michael Niedermayer [Thu, 30 Oct 2014 00:52:04 +0000 (00:52 +0000)]
aacsbr: change order of operation to prevent out of array read

CC: libav-stable@libav.org
Bug-Id: CID 732250

5 years agoassdec: check av_new_packet return value
Vittorio Giovara [Fri, 24 Oct 2014 12:15:40 +0000 (13:15 +0100)]
assdec: check av_new_packet return value

CC: libav-stable@libav.org
Bug-Id: CID 703626

5 years agomtv: improve header check and avoid division by zero
Vittorio Giovara [Fri, 24 Oct 2014 12:15:36 +0000 (13:15 +0100)]
mtv: improve header check and avoid division by zero

CC: libav-stable@libav.org
Bug-Id: CID 732203 / CID 732204

5 years agomatroskaenc: write correct Display{Width, Height} in stereo encoding
Vittorio Giovara [Wed, 22 Oct 2014 13:36:32 +0000 (14:36 +0100)]
matroskaenc: write correct Display{Width, Height} in stereo encoding

should be the raw amount of pixels (for example 3840x1080 for full HD side by
side) and the DisplayWidth/Height in pixels should be the amount of pixels for
one plane (1920x1080 for that full HD stream)."

So, move the aspect ratio check in the mkv_write_stereo_mode() function
and always write the embl when stereo format and/or aspect ration is set.
Also add a few comments to that function.

CC: libav-stable@libav.org
Found-by: Asan Usipov <asan.usipov@gmail.com>
5 years agomov: fix assigment check
Vittorio Giovara [Mon, 20 Oct 2014 13:11:25 +0000 (14:11 +0100)]
mov: fix assigment check

CC: libav-stable@libav.org
Bug-Id: CID 1197050

5 years agomxfdec: add missing break
Vittorio Giovara [Thu, 23 Oct 2014 23:05:57 +0000 (00:05 +0100)]
mxfdec: add missing break

CC: libav-stable@libav.org
Bug-Id: CID 732232

5 years agolavf: replace rename() with ff_rename()
Luca Barbato [Sun, 19 Oct 2014 22:48:49 +0000 (00:48 +0200)]
lavf: replace rename() with ff_rename()

The new function wraps errno so that its value is correctly reported
when other functions overwrite it (eg. in case of logging).

CC: libav-stable@libav.org
Bug-Id: CID 1135748
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoimg2dec: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:15 +0000 (14:11 +0100)]
img2dec: check av_new_packet return value

CC: libav-stable@libav.org
Bug-Id: CID 1087077

5 years agoaudiointerleave: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:14 +0000 (14:11 +0100)]
audiointerleave: check av_new_packet return value

CC: libav-stable@libav.org
Bug-Id: CID 1087078

5 years agoavfilter: check filter link validity
Vittorio Giovara [Mon, 20 Oct 2014 13:11:13 +0000 (14:11 +0100)]
avfilter: check filter link validity

Remove now redundant check.

CC: libav-stable@libav.org
Bug-Id: CID 700371

5 years agomp3dec: fix reading the Xing tag
Anton Khirnov [Sat, 18 Oct 2014 14:25:16 +0000 (16:25 +0200)]
mp3dec: fix reading the Xing tag

The quality scale field is only supposed to be present if the fourth bit
is set. In practice, lame always sets it, but other tools might not.

CC:libav-stable@libav.org

5 years agonutdec: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:19 +0000 (14:11 +0100)]
nutdec: check av_new_packet return value

CC: libav-stable@libav.org
Bug-Id: CID 733713

5 years agormdec: check av_new_packet return value
Vittorio Giovara [Mon, 20 Oct 2014 13:11:17 +0000 (14:11 +0100)]
rmdec: check av_new_packet return value

CC: libav-stable@libav.org
Bug-Id: CID 733714

5 years agovf_format: check input validity
Vittorio Giovara [Sat, 18 Oct 2014 15:10:35 +0000 (16:10 +0100)]
vf_format: check input validity

CC: libav-stable@libav.org
5 years agoaviobuf: check context before using it
Vittorio Giovara [Sat, 18 Oct 2014 00:12:13 +0000 (01:12 +0100)]
aviobuf: check context before using it

Avoid a possible null pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1135769

5 years agoavio: fix sizeof argument
Michael Niedermayer [Sat, 18 Oct 2014 00:12:12 +0000 (01:12 +0100)]
avio: fix sizeof argument

CC: libav-stable@libav.org
Bug-Id: CID 732284