ffmpeg.git
5 years agoMerge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187'
Michael Niedermayer [Thu, 13 Nov 2014 13:29:26 +0000 (14:29 +0100)]
Merge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187'

* commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187':
  indeo3: check ff_set_dimensions return value

See: 81ed7efbe24ef1b3d98c9e256d2a9332c1797ffd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'
Michael Niedermayer [Thu, 13 Nov 2014 13:21:58 +0000 (14:21 +0100)]
Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
  shorten: check for return value

Conflicts:
libavcodec/shorten.c

See: e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'
Michael Niedermayer [Thu, 13 Nov 2014 13:11:46 +0000 (14:11 +0100)]
Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'

* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a':
  dcadec: initialize variables before use

Conflicts:
libavcodec/dcadec.c

See: 53918a1c54b49e76c3ca517e2caada8372995712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'
Michael Niedermayer [Thu, 13 Nov 2014 13:00:55 +0000 (14:00 +0100)]
Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'

* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
  escape124: explicitly set get_bits1 variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'
Michael Niedermayer [Thu, 13 Nov 2014 12:59:22 +0000 (13:59 +0100)]
Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'

* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834':
  mlpdec: check for negative index

Conflicts:
libavcodec/mlpdec.c

See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b'
Michael Niedermayer [Thu, 13 Nov 2014 12:41:41 +0000 (13:41 +0100)]
Merge commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b'

* commit '6abe7edabb7d57e82d7ea6312d30cf05d2192c5b':
  ffv1: fix out-of-bounds read

The change should be harmless but theres no out of array access before
the change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'
Michael Niedermayer [Thu, 13 Nov 2014 12:34:39 +0000 (13:34 +0100)]
Merge commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2'

* commit '5aa710f46119bb9c1c38542f80f5338eb8b5ffb2':
  vorbisenc: add missing parenthesis

Conflicts:
libavcodec/vorbisenc.c

See: f72b735d41f9591452d2efe0987040462b409c2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'
Michael Niedermayer [Thu, 13 Nov 2014 12:32:08 +0000 (13:32 +0100)]
Merge commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310'

* commit 'e9a6ae775dabef3942632e8d4ef95fff94a1b310':
  dpxenc: mention missing break

Conflicts:
libavcodec/dpxenc.c

No change as the changed code is implemented differently in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4dda5e9b0829b119c17d950906c61d3ebffc494f'
Michael Niedermayer [Thu, 13 Nov 2014 12:30:59 +0000 (13:30 +0100)]
Merge commit '4dda5e9b0829b119c17d950906c61d3ebffc494f'

* commit '4dda5e9b0829b119c17d950906c61d3ebffc494f':
  sunrastenc: mention missing break

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '28d82b7675bea76a1349070a3cdd737d964d4775'
Michael Niedermayer [Thu, 13 Nov 2014 12:22:02 +0000 (13:22 +0100)]
Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'

* commit '28d82b7675bea76a1349070a3cdd737d964d4775':
  vc1dec: refactor check with missing parenthesis

Conflicts:
libavcodec/vc1_mc.c
tests/ref/fate/vc1_ilaced_twomv

Theres no change to the reference checksums as this bug was not
in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b'
Michael Niedermayer [Thu, 13 Nov 2014 12:05:04 +0000 (13:05 +0100)]
Merge commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b'

* commit '2c98dc75f2802a2fe91922d4a11b698b66420e5b':
  vc1dec: always initialize tx and ty

Not merged, tx/ty are initialized on every codepath before use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
Michael Niedermayer [Thu, 13 Nov 2014 11:54:52 +0000 (12:54 +0100)]
Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'

* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
  dnxhdenc: check negative index

Conflicts:
libavcodec/dnxhdenc.c

Not merged, the cid index thats taken out of our table will be found again in
said table.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
Michael Niedermayer [Thu, 13 Nov 2014 11:53:31 +0000 (12:53 +0100)]
Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'

* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
  display: fix order of operands

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bdcb5794f0c2d74371152303bffe4172671af264'
Michael Niedermayer [Thu, 13 Nov 2014 11:13:38 +0000 (12:13 +0100)]
Merge commit 'bdcb5794f0c2d74371152303bffe4172671af264'

* commit 'bdcb5794f0c2d74371152303bffe4172671af264':
  nellymoserenc: fix array index

Not merged, the original code was correct.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276'
Michael Niedermayer [Thu, 13 Nov 2014 11:12:40 +0000 (12:12 +0100)]
Merge commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276'

* commit 'aa7c429c4e8e561009176d51b7dcb626c85eb276':
  nellymoserenc: fix array element ordering

See: 62722ae2d4b2e5f632c725e150dde0f7d0fbfe8d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'
Michael Niedermayer [Thu, 13 Nov 2014 11:12:16 +0000 (12:12 +0100)]
Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'

* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
  libopusenc: prevent an out-of-bounds read by returning early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e'
Michael Niedermayer [Thu, 13 Nov 2014 11:01:37 +0000 (12:01 +0100)]
Merge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e'

* commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e':
  libopusenc: check return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '29234f56818135faf2f1868ab324c073abd28fbd'
Michael Niedermayer [Thu, 13 Nov 2014 10:59:44 +0000 (11:59 +0100)]
Merge commit '29234f56818135faf2f1868ab324c073abd28fbd'

* commit '29234f56818135faf2f1868ab324c073abd28fbd':
  vp7: fix checking vp7_feature_value_size()

See: 28f8114bd240712e5c2a9b52df519858fccc267c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '68a35473ed423a14731c418939fba7913647979a'
Michael Niedermayer [Thu, 13 Nov 2014 10:34:04 +0000 (11:34 +0100)]
Merge commit '68a35473ed423a14731c418939fba7913647979a'

* commit '68a35473ed423a14731c418939fba7913647979a':
  4xm: more thorought check for negative index and negative shift

Conflicts:
libavcodec/4xm.c

Mostly not merged, the added checks, check for impossible conditions
for paranoias sake they are replaced by asserts but thats probably overkill
the vlc table does not contain out of range values or holes,
nor does it permit the log2 values to become negative. Whenever a
log2 value reaches 0 the selected table no longer contains an entry to trigger
the case that would decrease it further

Adding such impossible checks would confuse the reader

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration()
Michael Niedermayer [Thu, 13 Nov 2014 01:48:40 +0000 (02:48 +0100)]
avcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration()

Fixes Ticket3979

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoindeo3: check ff_set_dimensions return value
Vittorio Giovara [Wed, 12 Nov 2014 10:13:02 +0000 (11:13 +0100)]
indeo3: check ff_set_dimensions return value

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

5 years agoshorten: check for return value
Vittorio Giovara [Tue, 11 Nov 2014 16:40:08 +0000 (17:40 +0100)]
shorten: check for return value

Avoid a possible negative bitshift.

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

5 years agodcadec: initialize variables before use
Vittorio Giovara [Wed, 12 Nov 2014 10:13:03 +0000 (11:13 +0100)]
dcadec: initialize variables before use

CC: libav-stable@libav.org
Bug-Id: CID 700751 / CID 700752

5 years agoescape124: explicitly set get_bits1 variable
Vittorio Giovara [Tue, 11 Nov 2014 16:40:09 +0000 (17:40 +0100)]
escape124: explicitly set get_bits1 variable

Makes coverity less confused.

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

5 years agomlpdec: check for negative index
Vittorio Giovara [Tue, 11 Nov 2014 16:40:06 +0000 (17:40 +0100)]
mlpdec: check for negative index

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

5 years agoffv1: fix out-of-bounds read
Vittorio Giovara [Tue, 11 Nov 2014 16:40:04 +0000 (17:40 +0100)]
ffv1: fix out-of-bounds read

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

5 years agovorbisenc: add missing parenthesis
Vittorio Giovara [Tue, 11 Nov 2014 16:40:03 +0000 (17:40 +0100)]
vorbisenc: add missing parenthesis

Bug-Id: CID 1238791

5 years agodpxenc: mention missing break
Vittorio Giovara [Tue, 11 Nov 2014 16:40:02 +0000 (17:40 +0100)]
dpxenc: mention missing break

Bug-Id: CID 732229

5 years agosunrastenc: mention missing break
Vittorio Giovara [Tue, 11 Nov 2014 16:40:01 +0000 (17:40 +0100)]
sunrastenc: mention missing break

Bug-Id: CID 732231

5 years agovc1dec: refactor check with missing parenthesis
Vittorio Giovara [Tue, 11 Nov 2014 16:40:00 +0000 (17:40 +0100)]
vc1dec: refactor check with missing parenthesis

FATE tests updated accordingly, no visual difference.

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

5 years agovc1dec: always initialize tx and ty
Vittorio Giovara [Tue, 11 Nov 2014 16:39:59 +0000 (17:39 +0100)]
vc1dec: always initialize tx and ty

CC: libav-stable@libav.org
Bug-Id: CID 1245702 / CID 1245703

5 years agodnxhdenc: check negative index
Vittorio Giovara [Tue, 11 Nov 2014 12:27:03 +0000 (13:27 +0100)]
dnxhdenc: check negative index

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

5 years agodisplay: fix order of operands
Vittorio Giovara [Tue, 11 Nov 2014 12:27:02 +0000 (13:27 +0100)]
display: fix order of operands

CC: libav-stable@libav.org
Bug-Id: CID 1238828 / CID 1238832

5 years agonellymoserenc: fix array index
Vittorio Giovara [Tue, 11 Nov 2014 12:26:57 +0000 (13:26 +0100)]
nellymoserenc: fix array index

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

5 years agonellymoserenc: fix array element ordering
Michael Niedermayer [Tue, 11 Nov 2014 12:26:56 +0000 (13:26 +0100)]
nellymoserenc: fix array element ordering

Fixes assertion failures and valgrind warnings in trellis encoder.

CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257

5 years agolibopusenc: prevent an out-of-bounds read by returning early
Vittorio Giovara [Tue, 11 Nov 2014 12:26:55 +0000 (13:26 +0100)]
libopusenc: prevent an out-of-bounds read by returning early

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

5 years agolibopusenc: check return value
Vittorio Giovara [Tue, 11 Nov 2014 12:26:54 +0000 (13:26 +0100)]
libopusenc: check return value

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

5 years agovp7: fix checking vp7_feature_value_size()
Michael Niedermayer [Tue, 11 Nov 2014 12:27:00 +0000 (13:27 +0100)]
vp7: fix checking vp7_feature_value_size()

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

5 years ago4xm: more thorought check for negative index and negative shift
Vittorio Giovara [Sun, 9 Nov 2014 07:48:41 +0000 (08:48 +0100)]
4xm: more thorought check for negative index and negative shift

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

5 years agoswscale/utils: support bayer input + scaling, and bayer input + any supported output
Michael Niedermayer [Wed, 12 Nov 2014 22:53:08 +0000 (23:53 +0100)]
swscale/utils: support bayer input + scaling, and bayer input + any supported output

Fixes Ticket4053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/opt: fix av_opt_get function
Lukasz Marek [Tue, 11 Nov 2014 20:17:58 +0000 (21:17 +0100)]
lavu/opt: fix av_opt_get function

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoffserver_config: report not closed last tag
Lukasz Marek [Sat, 8 Nov 2014 18:17:48 +0000 (19:17 +0100)]
ffserver_config: report not closed last tag

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: fix memleak in test
Lukasz Marek [Wed, 12 Nov 2014 22:26:45 +0000 (23:26 +0100)]
lavu/opt: fix memleak in test

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoavcodec/dvbsubdec: av_assert* instead of assert()
Michael Niedermayer [Wed, 12 Nov 2014 17:14:28 +0000 (18:14 +0100)]
avcodec/dvbsubdec: av_assert* instead of assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/flacdsp: separate decoder and encoder dsp initialization
James Almer [Mon, 10 Nov 2014 20:06:08 +0000 (17:06 -0300)]
x86/flacdsp: separate decoder and encoder dsp initialization

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/dvbsubdec: Cleanup on *malloc failure
Michael Niedermayer [Wed, 12 Nov 2014 16:28:53 +0000 (17:28 +0100)]
avcodec/dvbsubdec: Cleanup on *malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec...
Rong Yan [Wed, 12 Nov 2014 07:02:46 +0000 (07:02 +0000)]
libswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec() yuv2planeX_8() for little endian

add marcos GET_LS() GET_VF() LOAD_FILTER() LOAD_L1() GET_VF4() FIRST_LOAD() UPDATE_PTR() LOAD_SRCV() LOAD_SRCV8() GET_VFD() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/tcp: Clarify that the -timeout option takes microseconds.
Carl Eugen Hoyos [Wed, 12 Nov 2014 12:52:56 +0000 (13:52 +0100)]
lavf/tcp: Clarify that the -timeout option takes microseconds.

5 years agolavd/avfoundation: Remove unused -frame_rate option.
Carl Eugen Hoyos [Wed, 12 Nov 2014 08:55:11 +0000 (09:55 +0100)]
lavd/avfoundation: Remove unused -frame_rate option.

5 years agoconfigure: Hack to treat x32 as x86_64.
Reimar Döffinger [Wed, 12 Nov 2014 08:53:01 +0000 (09:53 +0100)]
configure: Hack to treat x32 as x86_64.

Allows shared compilation on x32 with --disable-asm.

5 years agoavcodec/h264_parser: Avoid adding SEI to the global header
Michael Niedermayer [Wed, 12 Nov 2014 02:27:26 +0000 (03:27 +0100)]
avcodec/h264_parser: Avoid adding SEI to the global header

Only consider SEI when no PPS has been found yet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 12 Nov 2014 00:04:46 +0000 (01:04 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: signal the frame queue before closing audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/webmdashenc: Representation IDs should be unique.
Vignesh Venkatasubramanian [Tue, 11 Nov 2014 18:02:05 +0000 (10:02 -0800)]
lavf/webmdashenc: Representation IDs should be unique.

According to the DASH spec, Representation IDs should be unique
across all adaptation sets. Fixing that and updating the fate
reference file to reflect this change.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'
Michael Niedermayer [Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)]
Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'

* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
  tiff: Use av_mallocz_array

Conflicts:
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'
Michael Niedermayer [Tue, 11 Nov 2014 22:54:37 +0000 (23:54 +0100)]
Merge commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8'

* commit 'c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
  opt: Fix the documentation mentioning av_set_string3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'
Michael Niedermayer [Tue, 11 Nov 2014 22:19:27 +0000 (23:19 +0100)]
Merge commit '1b667269062eb6aec0b8726393ea91b7f7f57fde'

* commit '1b667269062eb6aec0b8726393ea91b7f7f57fde':
  h264_parser: don't stop on SPS_EXT in split

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4cb9f1a77432de6f368df69bebbc082368a88c86'
Michael Niedermayer [Tue, 11 Nov 2014 22:18:03 +0000 (23:18 +0100)]
Merge commit '4cb9f1a77432de6f368df69bebbc082368a88c86'

* commit '4cb9f1a77432de6f368df69bebbc082368a88c86':
  h264_cabac: fix one fill_rectangle() indentation level

See: 4260ed462b4ca92e90fb13006b7b5db8010a32d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '60b055133485891405722bc9722e2c74fc9764b8'
Michael Niedermayer [Tue, 11 Nov 2014 22:16:15 +0000 (23:16 +0100)]
Merge commit '60b055133485891405722bc9722e2c74fc9764b8'

* commit '60b055133485891405722bc9722e2c74fc9764b8':
  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 '443502aed8b814d883825e52e91e4f018955aa66'
Michael Niedermayer [Tue, 11 Nov 2014 22:06:44 +0000 (23:06 +0100)]
Merge commit '443502aed8b814d883825e52e91e4f018955aa66'

* commit '443502aed8b814d883825e52e91e4f018955aa66':
  dvbsubdec: move shared codepath

Conflicts:
libavcodec/dvbsubdec.c

The merged code is ignored and the factorization redone with
the code that is in FFmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: signal the frame queue before closing audio
Marton Balint [Mon, 10 Nov 2014 22:23:47 +0000 (23:23 +0100)]
ffplay: signal the frame queue before closing audio

Fixed regression caused by 631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay
does not quit if the audio thread is blocked.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavcodec/dvbsubdec: Fix 8bit non_mod case
Michael Niedermayer [Thu, 31 Jul 2014 11:25:43 +0000 (13:25 +0200)]
avcodec/dvbsubdec: Fix 8bit non_mod case

Untested, i failed to find a sample which triggers this case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: use av_freep() for saftey
Michael Niedermayer [Tue, 11 Nov 2014 21:20:20 +0000 (22:20 +0100)]
avcodec/dvbsubdec: use av_freep() for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'
Michael Niedermayer [Tue, 11 Nov 2014 21:19:54 +0000 (22:19 +0100)]
Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'

* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: Add return code to save_subtitle_set()
Michael Niedermayer [Tue, 11 Nov 2014 21:15:14 +0000 (22:15 +0100)]
avcodec/dvbsubdec: Add return code to save_subtitle_set()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1bdd21d97528d870fbb4388e837abaf390f2f7d7'
Michael Niedermayer [Tue, 11 Nov 2014 21:04:34 +0000 (22:04 +0100)]
Merge commit '1bdd21d97528d870fbb4388e837abaf390f2f7d7'

* commit '1bdd21d97528d870fbb4388e837abaf390f2f7d7':
  dvbsubdec: add missing break

See: 8b973d4937f833d1c7a226cfb2c2bc404e8f23a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a6defd1f5b1bffcea7aa00ff379a6602cdaf2d05'
Michael Niedermayer [Tue, 11 Nov 2014 21:03:27 +0000 (22:03 +0100)]
Merge commit 'a6defd1f5b1bffcea7aa00ff379a6602cdaf2d05'

* commit 'a6defd1f5b1bffcea7aa00ff379a6602cdaf2d05':
  hevc_cabac: decrease CABAC_MAX_BIN

See: 812066835189b9bf8c71d4178019949da4171259
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e9be5a20c0b36dce1cae11f5f5957886231a764'
Michael Niedermayer [Tue, 11 Nov 2014 20:46:56 +0000 (21:46 +0100)]
Merge commit '9e9be5a20c0b36dce1cae11f5f5957886231a764'

* commit '9e9be5a20c0b36dce1cae11f5f5957886231a764':
  hevc_mvs: prevent unitialized use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add opt-test
Lukasz Marek [Sun, 9 Nov 2014 22:10:34 +0000 (23:10 +0100)]
fate: add opt-test

5 years agolavu/opt: update tests
Lukasz Marek [Sun, 9 Nov 2014 22:09:44 +0000 (23:09 +0100)]
lavu/opt: update tests

In general this commit prepares opt tests to be added to fate.

The commit set some non-zero defaults for test options.
It allows to check if defaults are really set.

Added printing of default values.

Added more cases for testing av_set_options_string

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: add support for binary defaults
Lukasz Marek [Sun, 9 Nov 2014 22:09:07 +0000 (23:09 +0100)]
lavu/opt: add support for binary defaults

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavu/opt: check for NULL before parsing
Lukasz Marek [Sun, 9 Nov 2014 22:15:58 +0000 (23:15 +0100)]
lavu/opt: check for NULL before parsing

set_string_binary crashes when called with val==NULL

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '0e1ebfebc8326069732795698a82f3fea0742a54'
Michael Niedermayer [Tue, 11 Nov 2014 20:38:55 +0000 (21:38 +0100)]
Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'

* commit '0e1ebfebc8326069732795698a82f3fea0742a54':
  4xm: drop unnecessary check

Conflicts:
libavcodec/4xm.c

The check is currently redundant, it is for saftey left in place though

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea'
Michael Niedermayer [Tue, 11 Nov 2014 20:35:53 +0000 (21:35 +0100)]
Merge commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea'

* commit '7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea':
  hpeldsp: Increase put_no_rnd_pixels_tab[][] size

See: 1e41b8cd072e4f738d9ef75b1ac310a9c8fbcc19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'
Michael Niedermayer [Tue, 11 Nov 2014 20:33:27 +0000 (21:33 +0100)]
Merge commit 'db71c4926d948717ce3b74253eb385dc43dcb14d'

* commit 'db71c4926d948717ce3b74253eb385dc43dcb14d':
  mjpegenc: fix argument size in encode_mb

Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

See: 256f530603ef3838a712a4fcd737b46b7bce455e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'
Michael Niedermayer [Tue, 11 Nov 2014 20:24:15 +0000 (21:24 +0100)]
Merge commit 'f349f4b5502c94943c30001b8a4d75daded3281c'

* commit 'f349f4b5502c94943c30001b8a4d75daded3281c':
  mpegvideo: fix size of array

See: 9f02d4ed0f72c017dba6fb71d5997c632aa52c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
Michael Niedermayer [Tue, 11 Nov 2014 20:20:50 +0000 (21:20 +0100)]
Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'

* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
  mpegvideo: check mpv return value

Conflicts:
libavcodec/mpegvideo.c

See: f4d73f0fb55e0b5931c859ddb4d2d1617b60d560
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'
Michael Niedermayer [Tue, 11 Nov 2014 20:04:45 +0000 (21:04 +0100)]
Merge commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba'

* commit 'fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
  mpeg12enc: increase declared size of block function argument

See: 2cf514354bbeebb2334d00ab54c3fcb8ae2ee678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'
Michael Niedermayer [Tue, 11 Nov 2014 19:58:33 +0000 (20:58 +0100)]
Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'

* commit '52f954da7594c31ad94c9bcb54290145b59b27f5':
  libavcodec: Unconditionally build xiph.o

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: Add myself as maintainer for Icecast protocol
Marvin Scholz [Tue, 11 Nov 2014 17:24:20 +0000 (18:24 +0100)]
MAINTAINERS: Add myself as maintainer for Icecast protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoIcecast: Use 100-continue if possible for proper error handling
Marvin Scholz [Tue, 11 Nov 2014 01:10:22 +0000 (02:10 +0100)]
Icecast: Use 100-continue if possible for proper error handling

Using 100-continue ffmpeg will only send data if the server confirms it,
so if there is an error with auth or mounpoint, this allows that it is
properly reported to the user. Else ffmpeg sends data and just quits at
some point without an error message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoIcecast: always send a content-type
Marvin Scholz [Tue, 11 Nov 2014 00:51:23 +0000 (01:51 +0100)]
Icecast: always send a content-type

use a default (audio/mpeg for historical reason) if none. Required since Icecast 2.4.1
Not using AVOption default because this breaks content-type warnings (needs to
detect if no type was set by the user)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotiff: Use av_mallocz_array
Luca Barbato [Sun, 9 Nov 2014 14:11:26 +0000 (15:11 +0100)]
tiff: Use av_mallocz_array

CC: libav-stable@libav.org
5 years agoopt: Fix the documentation mentioning av_set_string3
Luca Barbato [Tue, 11 Nov 2014 01:39:27 +0000 (02:39 +0100)]
opt: Fix the documentation mentioning av_set_string3

It is av_opt_set now.

5 years agoh264_parser: don't stop on SPS_EXT in split
John Stebbins [Fri, 31 Oct 2014 15:24:38 +0000 (08:24 -0700)]
h264_parser: don't stop on SPS_EXT in split

Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split.
These codes can come before the PPS and results in incomplete extradata.

5 years agoh264_cabac: fix one fill_rectangle() indentation level
Michael Niedermayer [Mon, 10 Nov 2014 07:43:08 +0000 (08:43 +0100)]
h264_cabac: fix one fill_rectangle() indentation level

Bug-Id: CID 1087088

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 agodvbsubdec: move shared codepath
Vittorio Giovara [Sun, 9 Nov 2014 07:48:45 +0000 (08:48 +0100)]
dvbsubdec: move shared codepath

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

5 years agodvbsubdec: improve error checking
Vittorio Giovara [Sun, 9 Nov 2014 07:48:44 +0000 (08:48 +0100)]
dvbsubdec: improve error checking

Use av_mallocz_array instead of iterating and check the returned memory.
Check returned memory and cleanly exit in case of error during the loop.
Avoid a null pointer dereference for invalid data.

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

5 years agodvbsubdec: add missing break
Jernej Fijačko [Sun, 9 Nov 2014 07:48:46 +0000 (08:48 +0100)]
dvbsubdec: add missing break

Fix a memory leak too.

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

5 years agohevc_cabac: decrease CABAC_MAX_BIN
Michael Niedermayer [Sun, 9 Nov 2014 07:48:38 +0000 (08:48 +0100)]
hevc_cabac: decrease CABAC_MAX_BIN

Prevents shifts with undefined behavior, as no syntax element has a valid
value greater than 1 << 31.

Bug-Id: CID 1206635

5 years agohevc_mvs: prevent unitialized use
Vittorio Giovara [Sun, 9 Nov 2014 07:48:39 +0000 (08:48 +0100)]
hevc_mvs: prevent unitialized use

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

5 years agoavcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to...
Changjiang Wei [Tue, 11 Nov 2014 02:39:39 +0000 (10:39 +0800)]
avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years ago4xm: drop unnecessary check
Vittorio Giovara [Sun, 9 Nov 2014 07:48:40 +0000 (08:48 +0100)]
4xm: drop unnecessary check

data_size is always >= 0 in this case.

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

5 years agohpeldsp: Increase put_no_rnd_pixels_tab[][] size
Michael Niedermayer [Tue, 4 Nov 2014 14:36:53 +0000 (09:36 -0500)]
hpeldsp: Increase put_no_rnd_pixels_tab[][] size

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

5 years agomjpegenc: fix argument size in encode_mb
Vittorio Giovara [Wed, 5 Nov 2014 14:40:30 +0000 (09:40 -0500)]
mjpegenc: fix argument size in encode_mb

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

5 years agolibavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_...
Rong Yan [Tue, 11 Nov 2014 06:03:01 +0000 (06:03 +0000)]
libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/ppc/me_cmp.c : factorize little and big endian code
Rong Yan [Tue, 11 Nov 2014 06:03:01 +0000 (06:03 +0000)]
libavcodec/ppc/me_cmp.c : factorize little and big endian code

add marcos GET_PERM() LOAD_PIX() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: fix size of array
Vittorio Giovara [Tue, 4 Nov 2014 14:37:01 +0000 (09:37 -0500)]
mpegvideo: fix size of array

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

5 years agompegvideo: check mpv return value
Vittorio Giovara [Tue, 4 Nov 2014 14:37:00 +0000 (09:37 -0500)]
mpegvideo: check mpv return value

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

5 years agompeg12enc: increase declared size of block function argument
Michael Niedermayer [Tue, 4 Nov 2014 14:36:58 +0000 (09:36 -0500)]
mpeg12enc: increase declared size of block function argument

CC: libav-stable@libav.org
Bug-Id: CID 1047236
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>