ffmpeg.git
5 years agoMerge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'
Michael Niedermayer [Mon, 20 Apr 2015 21:13:12 +0000 (23:13 +0200)]
Merge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'

* commit '1746dc382ddbf3f8a3f039815644f7eb9076110e':
  hqxdsp.h: #include "stddef.h"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'
Michael Niedermayer [Mon, 20 Apr 2015 21:00:01 +0000 (23:00 +0200)]
Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'

* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'
Michael Niedermayer [Mon, 20 Apr 2015 20:49:50 +0000 (22:49 +0200)]
Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'

* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf':
  h264_ps: Return meaningful error codes and address a memory leak

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '338ed3ed33c412c2828446c4e2a76949161fec6a'
Michael Niedermayer [Mon, 20 Apr 2015 20:43:31 +0000 (22:43 +0200)]
Merge commit '338ed3ed33c412c2828446c4e2a76949161fec6a'

* commit '338ed3ed33c412c2828446c4e2a76949161fec6a':
  ffv1: Pass correct pointers to av_free()

Conflicts:
libavcodec/ffv1.c

See: a3963cc8ec3b4e1780aadcbc0e5a7af625bae175
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b'
Michael Niedermayer [Mon, 20 Apr 2015 20:32:33 +0000 (22:32 +0200)]
Merge commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b'

* commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b':
  fate: Omit the results if the test passed

See: 1a562adb0101ac8372593b56ccd1bdb4ebb96b72
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd34039b171bebe37bf723a1b03e5651267099739'
Michael Niedermayer [Mon, 20 Apr 2015 20:24:15 +0000 (22:24 +0200)]
Merge commit 'd34039b171bebe37bf723a1b03e5651267099739'

* commit 'd34039b171bebe37bf723a1b03e5651267099739':
  rmenc: Drop the temporary buffer for ac3 byteswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '656e31ed8728b0c095d037dc9764fc8137c87200'
Michael Niedermayer [Mon, 20 Apr 2015 20:09:04 +0000 (22:09 +0200)]
Merge commit '656e31ed8728b0c095d037dc9764fc8137c87200'

* commit '656e31ed8728b0c095d037dc9764fc8137c87200':
  ogg: Forward errors further

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b18346817d57c96cc47811cf78b26653e96bd304'
Michael Niedermayer [Mon, 20 Apr 2015 19:52:18 +0000 (21:52 +0200)]
Merge commit 'b18346817d57c96cc47811cf78b26653e96bd304'

* commit 'b18346817d57c96cc47811cf78b26653e96bd304':
  flac: fix realloc loop with invalid flac files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2cc3936599b6fc63143036659653d1be0624360f'
Michael Niedermayer [Mon, 20 Apr 2015 19:45:47 +0000 (21:45 +0200)]
Merge commit '2cc3936599b6fc63143036659653d1be0624360f'

* commit '2cc3936599b6fc63143036659653d1be0624360f':
  dashenc: Add a publishTime field in dynamic manifests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohqxdsp.h: #include "stddef.h"
Vittorio Giovara [Mon, 20 Apr 2015 18:11:49 +0000 (19:11 +0100)]
hqxdsp.h: #include "stddef.h"

It is required by ptrdiff_t, fixes make checkheaders.

5 years agofate: gapless: fix mp3 tests
wm4 [Mon, 20 Apr 2015 17:36:52 +0000 (19:36 +0200)]
fate: gapless: fix mp3 tests

Seeking to a negative time did not have the desired effect of seeking to
the next valid position (the file start). On the other hand, just
"-ss 0" will normally seek to a position higher than 0, because it adds
the start time of the file. (The start time is not 0 because the gapless
code skips a few samples from the start.)

Fix this by using the "-seek_timestamp 1" option, which makes "-ss 0" do
what you'd expect it would do.

Also put the -ss option at the right place, before -i. This actually
makes it seek, instead of something completely else. The ".out-3" test
is no different in the -usetoc 0/1 cases, because the seeking is
inaccurate (in both cases).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: add option not to offset seek position by start time
wm4 [Mon, 20 Apr 2015 17:36:51 +0000 (19:36 +0200)]
ffmpeg: add option not to offset seek position by start time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: Fix variables constness in ff_iso8601_to_unix_time()
Vittorio Giovara [Mon, 20 Apr 2015 11:18:38 +0000 (12:18 +0100)]
lavf: Fix variables constness in ff_iso8601_to_unix_time()

warning: assigning to
      'char *' from 'const char *' discards qualifiers
      [-Wincompatible-pointer-types-discards-qualifiers]

5 years agoavformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS
Michael Niedermayer [Mon, 20 Apr 2015 15:41:22 +0000 (17:41 +0200)]
avformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS
Michael Niedermayer [Mon, 20 Apr 2015 15:29:20 +0000 (17:29 +0200)]
avformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: remove per packet timestamp print trace, theres generic code doing...
Michael Niedermayer [Mon, 20 Apr 2015 15:25:04 +0000 (17:25 +0200)]
avformat/mov: remove per packet timestamp print trace, theres generic code doing this in utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Place timestamp trace logs under FF_FDEBUG_TS
Michael Niedermayer [Mon, 20 Apr 2015 15:03:27 +0000 (17:03 +0200)]
avformat/utils: Place timestamp trace logs under FF_FDEBUG_TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Provide context for av_log() where one is available
Michael Niedermayer [Mon, 20 Apr 2015 14:23:43 +0000 (16:23 +0200)]
avformat/utils: Provide context for av_log() where one is available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Do not call av_log() per byte, use ff_tlog()
Michael Niedermayer [Mon, 20 Apr 2015 14:20:49 +0000 (16:20 +0200)]
avformat/avidec: Do not call av_log() per byte, use ff_tlog()

This was av_dlog() previously and should not have been changed to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_ps: Return meaningful error codes and address a memory leak
Vittorio Giovara [Mon, 20 Apr 2015 12:01:59 +0000 (13:01 +0100)]
h264_ps: Return meaningful error codes and address a memory leak

Bug-Id: CID 1026763

5 years agoffv1: Pass correct pointers to av_free()
Diego Biurrun [Mon, 20 Apr 2015 11:58:45 +0000 (13:58 +0200)]
ffv1: Pass correct pointers to av_free()

Bug-Id: CID 1295124

5 years agoavcodec/parser: Remove duplicate header inlcude
Michael Niedermayer [Mon, 20 Apr 2015 12:58:09 +0000 (14:58 +0200)]
avcodec/parser: Remove duplicate header inlcude

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/mips/generic_macros_msa: volatile doesnt need __
Michael Niedermayer [Sat, 18 Apr 2015 10:16:28 +0000 (12:16 +0200)]
avutil/mips/generic_macros_msa: volatile doesnt need __

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/api-flac-test: clear callers context with close_*
Michael Niedermayer [Mon, 20 Apr 2015 12:24:38 +0000 (14:24 +0200)]
avcodec/api-flac-test: clear callers context with close_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec: Add FLAC API test
Ludmila Glinskih [Mon, 20 Apr 2015 00:03:08 +0000 (03:03 +0300)]
libavcodec: Add FLAC API test

Signed-off-by: Ludmila Glinskih <lglinskih@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flacenc: also count wasted bits in subframe_count_exact()
Michael Niedermayer [Mon, 20 Apr 2015 12:11:15 +0000 (14:11 +0200)]
avcodec/flacenc: also count wasted bits in subframe_count_exact()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
Michael Niedermayer [Mon, 20 Apr 2015 10:46:29 +0000 (12:46 +0200)]
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'

* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
  jack: Check memory allocation

Conflicts:
libavdevice/jack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Omit the results if the test passed
Timothy Gu [Fri, 10 Apr 2015 17:36:03 +0000 (10:36 -0700)]
fate: Omit the results if the test passed

The FATE server does not report this information anyway and omitting
it makes the successful run send much less data.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agormenc: Drop the temporary buffer for ac3 byteswap
Luca Barbato [Sat, 21 Mar 2015 14:38:37 +0000 (15:38 +0100)]
rmenc: Drop the temporary buffer for ac3 byteswap

Use direcly avio_w8().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoogg: Forward errors further
Luca Barbato [Sat, 21 Mar 2015 15:34:39 +0000 (16:34 +0100)]
ogg: Forward errors further

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoflac: fix realloc loop with invalid flac files
Thomas Guillem [Thu, 16 Apr 2015 16:33:31 +0000 (18:33 +0200)]
flac: fix realloc loop with invalid flac files

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavfilter/buffersrc: Use correct, matching deallocation function
Michael Niedermayer [Mon, 20 Apr 2015 10:17:05 +0000 (12:17 +0200)]
avfilter/buffersrc: Use correct, matching deallocation function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodashenc: Add a publishTime field in dynamic manifests
Martin Storsjö [Fri, 17 Apr 2015 21:01:02 +0000 (00:01 +0300)]
dashenc: Add a publishTime field in dynamic manifests

This field is mandatory in dynamic manifests.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'
Michael Niedermayer [Mon, 20 Apr 2015 10:12:48 +0000 (12:12 +0200)]
Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'

* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'
Michael Niedermayer [Mon, 20 Apr 2015 10:12:03 +0000 (12:12 +0200)]
Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'

* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
Michael Niedermayer [Mon, 20 Apr 2015 09:51:24 +0000 (11:51 +0200)]
Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'

* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
  g2meet: Support G2M5 codec variant

Conflicts:
libavcodec/version.h

See: 4ba5420e4d3699b89c9f7f15928cd486f88e9562
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'
Michael Niedermayer [Mon, 20 Apr 2015 09:50:10 +0000 (11:50 +0200)]
Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'

* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
  filtfmts: Avoid null pointer dereference

Conflicts:
libavfilter/filtfmts.c

See: 24326930d87dd7e851c1cc383bc0682d746ffaf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354'
Michael Niedermayer [Mon, 20 Apr 2015 09:39:28 +0000 (11:39 +0200)]
Merge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354'

* commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354':
  avutil: remove pointless bmi1 define

See: a40cee03a3be131729e0c06e4825d14ac2076b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e'
Michael Niedermayer [Mon, 20 Apr 2015 09:38:01 +0000 (11:38 +0200)]
Merge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e'

* commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e':
  aacdec: consistently use avctx for logging in decode_eld_specific_config

See: 5b75689b987e4c4dd4f34d5c8be389547e9cc701
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'
Michael Niedermayer [Mon, 20 Apr 2015 09:29:17 +0000 (11:29 +0200)]
Merge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'

* commit '3d71b1f8f09fccea7158e868fb9bd81b81205449':
  mpegvideo_enc: Simplify picture allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'
Michael Niedermayer [Mon, 20 Apr 2015 09:26:27 +0000 (11:26 +0200)]
Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'

* commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0':
  motion_est: Fix warning from zero_cmp() assignment

See: ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d593896aaa81356def8993e8c52294bd8bb2797'
Michael Niedermayer [Mon, 20 Apr 2015 09:13:03 +0000 (11:13 +0200)]
Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797'

* commit '4d593896aaa81356def8993e8c52294bd8bb2797':
  vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Conflicts:
libavcodec/vc1_pred.c

See: 6c5bd7d785ffb796b8cfbae677ab54755b26a22b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9286de045968ad456d4e752651eec22de5e89060'
Michael Niedermayer [Mon, 20 Apr 2015 09:03:32 +0000 (11:03 +0200)]
Merge commit '9286de045968ad456d4e752651eec22de5e89060'

* commit '9286de045968ad456d4e752651eec22de5e89060':
  mov: Double-check that alias path is not an absolute path

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'
Michael Niedermayer [Mon, 20 Apr 2015 03:51:36 +0000 (05:51 +0200)]
Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'

* commit '376589e5dd72aa2dd42500f456fca303fcdcad85':
  mov: Read alternate absolute path in dref alis

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
Michael Niedermayer [Mon, 20 Apr 2015 03:28:13 +0000 (05:28 +0200)]
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'

* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
  Canopus HQ/HQA decoder

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'
Michael Niedermayer [Mon, 20 Apr 2015 03:19:19 +0000 (05:19 +0200)]
Merge commit 'e6fb844f7b736e72da364032d251283bce9e63ad'

* commit 'e6fb844f7b736e72da364032d251283bce9e63ad':
  Implement shared parsing of INFO tag in Canopus family

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'
Michael Niedermayer [Mon, 20 Apr 2015 03:19:03 +0000 (05:19 +0200)]
Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'

* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
  fate: Prefix cllc tests with canopus

Conflicts:
tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'
Michael Niedermayer [Mon, 20 Apr 2015 03:09:47 +0000 (05:09 +0200)]
Merge commit '5b5338f6d1272526d2634501555cbaff4cdfb87b'

* commit '5b5338f6d1272526d2634501555cbaff4cdfb87b':
  hqx: Implement slice-threaded decoding

Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h

See: eff72a6c7375587a3280ddf59e6e26a4907823b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'
Michael Niedermayer [Mon, 20 Apr 2015 02:57:06 +0000 (04:57 +0200)]
Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'

* commit '453642f8afe9f979fcc813a246b1ec656ec36a93':
  hqx: Store shareable data in main decoder context

Conflicts:
libavcodec/hqx.c
libavcodec/hqx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'
Michael Niedermayer [Mon, 20 Apr 2015 02:33:06 +0000 (04:33 +0200)]
Merge commit 'ea031b75fb50c59196ccb654c9d143fb75365da9'

* commit 'ea031b75fb50c59196ccb654c9d143fb75365da9':
  hqx: Move DSP related code to a separate file

Conflicts:
libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'
Michael Niedermayer [Mon, 20 Apr 2015 02:29:58 +0000 (04:29 +0200)]
Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'

* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
  hqx: Merge invalid format check within switch block

Conflicts:
libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/internal: Fix ff_dlog() define like av_dlog()
Michael Niedermayer [Mon, 20 Apr 2015 02:12:45 +0000 (04:12 +0200)]
avcodec/internal: Fix ff_dlog() define like av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: fix build with DEBUG/TRACE
Michael Niedermayer [Mon, 20 Apr 2015 02:11:23 +0000 (04:11 +0200)]
avcodec: fix build with DEBUG/TRACE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'
Michael Niedermayer [Mon, 20 Apr 2015 01:34:22 +0000 (03:34 +0200)]
Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'

* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
  lavc: Replace av_dlog and tprintf with internal macros

Conflicts:
libavcodec/aacdec.c
libavcodec/audio_frame_queue.c
libavcodec/bitstream.c
libavcodec/dcadec.c
libavcodec/dnxhddec.c
libavcodec/dvbsubdec.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/get_bits.h
libavcodec/gifdec.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/imc.c
libavcodec/interplayvideo.c
libavcodec/jpeglsdec.c
libavcodec/libopencore-amr.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_parser.c
libavcodec/pngdec.c
libavcodec/ratecontrol.c
libavcodec/rv10.c
libavcodec/svq1dec.c
libavcodec/vqavideo.c
libavcodec/wmadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
Michael Niedermayer [Mon, 20 Apr 2015 01:19:29 +0000 (03:19 +0200)]
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'
Michael Niedermayer [Mon, 20 Apr 2015 00:48:19 +0000 (02:48 +0200)]
Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'

* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
  log: Introduce a more verbose debug level

Conflicts:
doc/APIchanges
doc/fftools-common-opts.texi
libavutil/log.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agojack: Check memory allocation
Federico Tomassetti [Sun, 19 Apr 2015 11:28:58 +0000 (12:28 +0100)]
jack: Check memory allocation

Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agobuffersrc: Fix resource leak on error
Federico Tomassetti [Mon, 23 Feb 2015 17:55:53 +0000 (17:55 +0000)]
buffersrc: Fix resource leak on error

Bug-Id: CID 1267902
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoavplay: Free frame and graph when memory allocation fails
Federico Tomassetti [Sun, 19 Apr 2015 10:43:14 +0000 (11:43 +0100)]
avplay: Free frame and graph when memory allocation fails

Bug-Id: CID 1291564
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agog2meet: Support G2M5 codec variant
Eric Zimmerman [Fri, 17 Apr 2015 12:39:01 +0000 (13:39 +0100)]
g2meet: Support G2M5 codec variant

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agofiltfmts: Avoid null pointer dereference
Himangi Saraogi [Fri, 3 Apr 2015 14:12:11 +0000 (19:42 +0530)]
filtfmts: Avoid null pointer dereference

5 years agoavutil: remove pointless bmi1 define
James Almer [Sat, 18 Apr 2015 23:12:54 +0000 (20:12 -0300)]
avutil: remove pointless bmi1 define

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoaacdec: consistently use avctx for logging in decode_eld_specific_config
Andreas Cadhalpun [Thu, 16 Apr 2015 14:58:32 +0000 (16:58 +0200)]
aacdec: consistently use avctx for logging in decode_eld_specific_config

ac may be NULL and then accessing ac->avctx results in a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
5 years agompegvideo_enc: Simplify picture allocation
Vittorio Giovara [Wed, 15 Apr 2015 14:16:13 +0000 (15:16 +0100)]
mpegvideo_enc: Simplify picture allocation

5 years agomotion_est: Fix warning from zero_cmp() assignment
Vittorio Giovara [Tue, 14 Apr 2015 11:32:06 +0000 (13:32 +0200)]
motion_est: Fix warning from zero_cmp() assignment

warning: incompatible
      pointer types assigning to 'me_cmp_func' (aka 'int (*)(struct
      MpegEncContext *, uint8_t *, uint8_t *, ptrdiff_t, int)') from 'int
      (MpegEncContext *, uint8_t *, uint8_t *, int, int)'
      [-Wincompatible-pointer-types]

5 years agovc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()
Vittorio Giovara [Sun, 19 Apr 2015 22:10:07 +0000 (23:10 +0100)]
vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Fix a rather lengthy initialization warning from clang.

5 years agomov: Double-check that alias path is not an absolute path
Vittorio Giovara [Tue, 7 Apr 2015 13:06:05 +0000 (15:06 +0200)]
mov: Double-check that alias path is not an absolute path

nlvl_to and nlvl_from can be set to 1 if both alias and target files
are in the same directory, so actually check the first character of the
string. We can do this because MacOS filepaths (alis type 2) are always
converted to UNIX filepaths (alis type 18).

5 years agomov: Read alternate absolute path in dref alis
Vittorio Giovara [Tue, 7 Apr 2015 13:06:04 +0000 (15:06 +0200)]
mov: Read alternate absolute path in dref alis

Absolute paths can be stored in alis type 2 and 18 according to my research:
the first is the canonical MacOS filepath, with path level separated by
colons, and the volume name within the filepath, while the second should be the
absolute filesystem path from the mount point.

5 years agoffmpeg: Fix null pointer dereference in do_video_out()
Michael Niedermayer [Sun, 19 Apr 2015 20:42:54 +0000 (22:42 +0200)]
ffmpeg: Fix null pointer dereference in do_video_out()

Fixes: CID1295087

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoCanopus HQ/HQA decoder
Vittorio Giovara [Thu, 9 Apr 2015 16:12:30 +0000 (18:12 +0200)]
Canopus HQ/HQA decoder

Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoImplement shared parsing of INFO tag in Canopus family
Vittorio Giovara [Thu, 9 Apr 2015 16:11:10 +0000 (18:11 +0200)]
Implement shared parsing of INFO tag in Canopus family

Add some bounds checking to CLLC; reduce HQX variable scoping,
add an error message.

5 years agofate: Prefix cllc tests with canopus
Vittorio Giovara [Thu, 9 Apr 2015 16:09:01 +0000 (18:09 +0200)]
fate: Prefix cllc tests with canopus

They belong to the same family of codecs.

5 years agohqx: Implement slice-threaded decoding
Vittorio Giovara [Thu, 9 Apr 2015 17:10:45 +0000 (19:10 +0200)]
hqx: Implement slice-threaded decoding

Inspired by a patch from Ferdinand Oeinck <ferdo@demon.nl>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohqx: Store shareable data in main decoder context
Vittorio Giovara [Thu, 9 Apr 2015 17:06:33 +0000 (19:06 +0200)]
hqx: Store shareable data in main decoder context

In preparation for multithreaded decoding.

5 years agoavformat/matroskadec: remove now duplicate doctype check
Michael Niedermayer [Sun, 19 Apr 2015 14:45:24 +0000 (16:45 +0200)]
avformat/matroskadec: remove now duplicate  doctype check

See: b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e
See: d9fe6b926cd619c311e45e0ae352cf09713c482c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpeg4videodec: Use check_marker()
Michael Niedermayer [Sun, 19 Apr 2015 13:34:43 +0000 (15:34 +0200)]
avcodec/mpeg4videodec: Use check_marker()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: Fix 2 typos
Michael Niedermayer [Sun, 19 Apr 2015 12:26:40 +0000 (14:26 +0200)]
avformat/http: Fix 2 typos

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohqx: Move DSP related code to a separate file
Vittorio Giovara [Thu, 9 Apr 2015 16:09:32 +0000 (18:09 +0200)]
hqx: Move DSP related code to a separate file

5 years agohqx: Merge invalid format check within switch block
Vittorio Giovara [Thu, 9 Apr 2015 16:09:31 +0000 (18:09 +0200)]
hqx: Merge invalid format check within switch block

5 years agolavc: Replace av_dlog and tprintf with internal macros
Vittorio Giovara [Mon, 16 Mar 2015 08:57:36 +0000 (08:57 +0000)]
lavc: Replace av_dlog and tprintf with internal macros

5 years agoReplace av_dlog with normal av_log at trace level
Vittorio Giovara [Mon, 16 Mar 2015 08:57:35 +0000 (08:57 +0000)]
Replace av_dlog with normal av_log at trace level

This applies to every library where performance is not critical.

5 years agolog: Introduce a more verbose debug level
Vittorio Giovara [Mon, 16 Mar 2015 08:57:34 +0000 (08:57 +0000)]
log: Introduce a more verbose debug level

And deprecate av_dlog macro.

5 years agoavformat/http: Return an error in case of prematurely ending data
Michael Niedermayer [Sat, 28 Mar 2015 23:33:35 +0000 (00:33 +0100)]
avformat/http: Return an error in case of prematurely ending data

Fixes Ticket 4039

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: remove pointless bmi1 define
James Almer [Sat, 18 Apr 2015 23:06:21 +0000 (20:06 -0300)]
avutil: remove pointless bmi1 define

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agocmdutils: indent protocols listing
Lou Logan [Sat, 18 Apr 2015 22:31:23 +0000 (14:31 -0800)]
cmdutils: indent protocols listing

For readability.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalsdec: validate time diff index
Andreas Cadhalpun [Sat, 18 Apr 2015 18:09:28 +0000 (20:09 +0200)]
alsdec: validate time diff index

If begin is smaller than t, the subtraction 'begin -= t' wraps around,
because begin is unsigned. The same applies for end < t.

This causes segmentation faults.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowavpackenc: use put_sbits()
James Almer [Sat, 18 Apr 2015 21:06:27 +0000 (18:06 -0300)]
wavpackenc: use put_sbits()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agomatroskadec: fix crash when parsing invalid mkv
Thomas Guillem [Fri, 10 Apr 2015 17:04:51 +0000 (19:04 +0200)]
matroskadec: fix crash when parsing invalid mkv

CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/riff: support G729A
Paul B Mahol [Fri, 17 Apr 2015 14:30:21 +0000 (14:30 +0000)]
avformat/riff: support G729A

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/g729dec: support decoding packets with multiple frames
Paul B Mahol [Fri, 17 Apr 2015 14:29:06 +0000 (14:29 +0000)]
avcodec/g729dec: support decoding packets with multiple frames

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e'
Michael Niedermayer [Sat, 18 Apr 2015 19:12:05 +0000 (21:12 +0200)]
Merge commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e'

* commit 'b8d7f3186e86234f6255f5e8ee9e98573b4d9a6e':
  matroskadec: fix crash when parsing invalid mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalsdec: limit avctx->bits_per_raw_sample to 32
Andreas Cadhalpun [Sat, 18 Apr 2015 18:29:13 +0000 (20:29 +0200)]
alsdec: limit avctx->bits_per_raw_sample to 32

avctx->bits_per_raw_sample is used in get_sbits_long, which only
supports up to 32 bits.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never conta...
Michael Niedermayer [Sat, 18 Apr 2015 18:50:23 +0000 (20:50 +0200)]
avcodec/alsdec: Use av_mallocz_array() for chan_data to ensure the arrays never contain random data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalsdec: ensure channel reordering is reversible
Andreas Cadhalpun [Sat, 18 Apr 2015 16:31:36 +0000 (18:31 +0200)]
alsdec: ensure channel reordering is reversible

If the same idx is used for more than one i, at least one entry in
sconf->chan_pos remains uninitialized.

This can cause segmentation faults.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoproresenc_anatoliy: use put_sbits()
James Almer [Sat, 18 Apr 2015 07:31:30 +0000 (04:31 -0300)]
proresenc_anatoliy: use put_sbits()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoadpcm: use av_clip_intp2()
James Almer [Sat, 18 Apr 2015 06:40:48 +0000 (03:40 -0300)]
adpcm: use av_clip_intp2()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agodca_xll: use av_clip_intp2()
James Almer [Sat, 18 Apr 2015 06:40:17 +0000 (03:40 -0300)]
dca_xll: use av_clip_intp2()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agodcaenc: use put_sbits()
James Almer [Sat, 18 Apr 2015 02:25:40 +0000 (23:25 -0300)]
dcaenc: use put_sbits()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoaaccoder: use put_sbits()
James Almer [Sat, 18 Apr 2015 02:23:44 +0000 (23:23 -0300)]
aaccoder: use put_sbits()

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agolavf: add documentation on directory listing API
Mariusz Szczepańczyk [Sat, 18 Apr 2015 02:31:14 +0000 (04:31 +0200)]
lavf: add documentation on directory listing API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>