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

4 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

4 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

4 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

4 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

4 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>
4 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

4 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

4 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>
4 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

4 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

4 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

4 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

4 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

4 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

4 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
4 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

4 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

4 years agoswscale: fix sign extensions in yuv planar conversion
Vittorio Giovara [Fri, 17 Oct 2014 13:31:35 +0000 (14:31 +0100)]
swscale: fix sign extensions in yuv planar conversion

Casting the left-most byte to unsigned avoids an undefined
result of the shift by 24 if bit 7 is set.

yuvPlanartouyvy_c and yuvPlanartoyuy2_c are affected.

CC: libav-stable@libav.org
Bug-Id: CID 732281 / CID 732282

4 years agooss_audio: use a macro to simplify ioctl() error checking
Timothy Gu [Wed, 15 Oct 2014 16:32:54 +0000 (17:32 +0100)]
oss_audio: use a macro to simplify ioctl() error checking

Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.

CC: libav-stable@libav.org
Bug-Id: CID 1238992
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavresample: Make sure the even check does not overflow
Luca Barbato [Wed, 15 Oct 2014 16:32:57 +0000 (17:32 +0100)]
avresample: Make sure the even check does not overflow

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

4 years agoaf_resample: check av_opt_set_dict return value
Vittorio Giovara [Fri, 17 Oct 2014 09:07:11 +0000 (10:07 +0100)]
af_resample: check av_opt_set_dict return value

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

4 years agovf_showinfo: Forward the av_image_get_linesize error
Vittorio Giovara [Fri, 17 Oct 2014 09:07:09 +0000 (10:07 +0100)]
vf_showinfo: Forward the av_image_get_linesize error

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

4 years agovf_drawtext: Do not leak the mmapped textfile
Luca Barbato [Fri, 17 Oct 2014 09:07:10 +0000 (10:07 +0100)]
vf_drawtext: Do not leak the mmapped textfile

And validate its size while at it.

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

4 years agocmdutils: Use the correct guard
Luca Barbato [Wed, 15 Oct 2014 00:43:30 +0000 (02:43 +0200)]
cmdutils: Use the correct guard

The OptionDef arrays are terminated with a { NULL } element not NULL.

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

4 years agoavformat: Make avformat_free_context handle NULL
Luca Barbato [Wed, 15 Oct 2014 00:35:55 +0000 (02:35 +0200)]
avformat: Make avformat_free_context handle NULL

Work as the other free()-like functions.

Bug-Id: CID 1087081
CC: libav-stable@libav.org
4 years agortsp: Check a memory allocation
Michael Lynch [Tue, 14 Oct 2014 20:30:39 +0000 (16:30 -0400)]
rtsp: Check a memory allocation

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agorm: Use the correct codec_data_size signedness
Luca Barbato [Thu, 4 Dec 2014 11:00:01 +0000 (12:00 +0100)]
rm: Use the correct codec_data_size signedness

The function takes a size and not an offset.

CC: libav-stable@libav.org
Sample-Id: rm_deadlock.rm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolatm: Do not give a score for a single instance
Luca Barbato [Fri, 5 Dec 2014 14:31:20 +0000 (15:31 +0100)]
latm: Do not give a score for a single instance

Bug-Id: 773
CC: libav-stable@libav.org
4 years agomp3: Tweak the probe scores
Luca Barbato [Sat, 6 Dec 2014 11:32:25 +0000 (12:32 +0100)]
mp3: Tweak the probe scores

Having more than 10 consecutive frames decoded as mp3 should be
considered a clear signal that the sample is mp3 and not mpegps.

Reported-By: Florian Iragne <florian@iragne.fr>
CC: libav-stable@libav.org
4 years agovf_frei0r: do not increment string if it reached the end
Vittorio Giovara [Fri, 5 Dec 2014 02:15:09 +0000 (02:15 +0000)]
vf_frei0r: do not increment string if it reached the end

Bug-Id: 778
CC: libav-stable@libav.org
4 years agosvq1dec: Unbreak the scratch buffer allocation
Michael Niedermayer [Sat, 6 Dec 2014 10:40:30 +0000 (11:40 +0100)]
svq1dec: Unbreak the scratch buffer allocation

The input packets are always assumed to be padded and
the av_fast_ family of function takes a pointer to a pointer.

Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for
a similar patch.

Introduced in 7b588bb691644e1b3c168b99accf74248a24e3cf.

Bug-Id: 766
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agovaapi: wrap codec specific functions in appropiate #ifs
Thiago Santos [Sun, 14 Dec 2014 20:59:27 +0000 (22:59 +0200)]
vaapi: wrap codec specific functions in appropiate #ifs

Fix linking when only a subset of vaapi decoders is enabled.

Bug-Id: 760
CC: libav-stable@libav.org
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agohevc: always clip luma_log2_weight_denom
Vittorio Giovara [Wed, 10 Dec 2014 01:41:44 +0000 (01:41 +0000)]
hevc: always clip luma_log2_weight_denom

Its value shall be between 0 and 7 according to the specifications.

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

4 years agoprores: Evaluate all the quantizers
Luca Barbato [Wed, 10 Dec 2014 00:43:50 +0000 (01:43 +0100)]
prores: Evaluate all the quantizers

Prevent an uninitialized data access.

CC: libav-stable@libav.org
Bug-Id: CID 703824 / CID 703825
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agotiff: Check the check_size() return value and forward it
Luca Barbato [Wed, 10 Dec 2014 01:44:20 +0000 (02:44 +0100)]
tiff: Check the check_size() return value and forward it

Also use the same type for add_entry and check_size.

Bug-Id: CID 700699
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovarao@gmail.com>
4 years agortpdec_h263_rfc2190: Clear the stored bits if discarding buffered data
Martin Storsjö [Wed, 17 Dec 2014 11:50:06 +0000 (13:50 +0200)]
rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data

If we throw away the buffered incomplete frame, make sure to also
throw away the buffered bits of an incomplete byte at the same
time.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit df07c07b3de0a5e8890078944de1eb5cb8372ef8)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoh261dec: Fix context initialization sequence
Michael Niedermayer [Fri, 15 Aug 2014 00:50:41 +0000 (02:50 +0200)]
h261dec: Fix context initialization sequence

ff_mpv_common_init sets s->context_initialized.

This fixes decoding of h261 in the cases where the demuxer
hasn't already set the frame size.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 3bb465245fed6069512e6821000391beae8a6066)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agocmdutils: check file access functions return values
Vittorio Giovara [Tue, 16 Dec 2014 09:43:48 +0000 (10:43 +0100)]
cmdutils: check file access functions return values

CC: libav-stable@libav.org
Bug-Id: CID 703706
(cherry picked from commit 38129c26c51b933d7db423f904ba0cd6a88ca1ed)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoaacenc: correctly check returned value
Vittorio Giovara [Wed, 17 Dec 2014 13:53:43 +0000 (14:53 +0100)]
aacenc: correctly check returned value

CC: libav-stable@libav.org
(cherry picked from commit 971099ff5a85377579eb5b8d3620e283957f097e)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavfi: always check av_expr_parse_and_eval() return value
Vittorio Giovara [Wed, 17 Dec 2014 14:19:43 +0000 (15:19 +0100)]
lavfi: always check av_expr_parse_and_eval() return value

CC: libav-stable@libav.org
Bug-Id: CID 703624
(cherry picked from commit 63be97ec403023fb664798432acedaf6e6922527)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoxsub: Support DXSA subtitles
Alexandre Colucci [Wed, 7 Jan 2015 11:18:08 +0000 (12:18 +0100)]
xsub: Support DXSA subtitles

These have a DXSA tag and contain alpha in addition to
color values for palette.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 5a1addd7c1d8ff218ed4b84f4f02fdb83980094c)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agompeg4audio: check the init_get_bits() return value
Anton Khirnov [Thu, 1 Jan 2015 16:56:56 +0000 (17:56 +0100)]
mpeg4audio: check the init_get_bits() return value

Fixes possible invalid reads.

CC:libav-stable@libav.org
(cherry picked from commit 7e4e010b80e76862e83afbd41c25d50e72f0b44c)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agosegment: Fix the failure paths
Luca Barbato [Mon, 5 Jan 2015 09:40:41 +0000 (10:40 +0100)]
segment: Fix the failure paths

A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.

CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
(cherry picked from commit b3f04657368a32a9903406395f865e230b1de348)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoswscale: check memory allocations
Vittorio Giovara [Wed, 17 Dec 2014 15:02:07 +0000 (16:02 +0100)]
swscale: check memory allocations

CC: libav-stable@libav.org
Bug-Id: CID 1257779
(cherry picked from commit 1dd797e3c9f179f957316a0becbec048b42df8aa)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoopt: check memory allocation
Vittorio Giovara [Thu, 18 Dec 2014 19:26:57 +0000 (20:26 +0100)]
opt: check memory allocation

CC: libav-stable@libav.org
Bug-Id: CID 1257771
(cherry picked from commit 07a0c0f0005072d115ace61e60f46be68582cc3a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>