ffmpeg.git
4 years agoavutil/error: Add AVERROR_INPUT_CHANGED & AVERROR_OUTPUT_CHANGED to error_entries[]
Michael Niedermayer [Thu, 9 Oct 2014 23:45:34 +0000 (01:45 +0200)]
avutil/error: Add AVERROR_INPUT_CHANGED & AVERROR_OUTPUT_CHANGED to error_entries[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/webm_dash: Allow filenames without directories
Vignesh Venkatasubramanian [Thu, 9 Oct 2014 21:56:47 +0000 (14:56 -0700)]
lavf/webm_dash: Allow filenames without directories

Fix basename computation code to allow just file names without any
directories in the path.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffplay: dont leave swresampler in half initialized state
Marton Balint [Wed, 8 Oct 2014 21:36:11 +0000 (23:36 +0200)]
ffplay: dont leave swresampler in half initialized state

On init failure, let's just free it, so next time it will be recreated from
start.

Also fixes Coverity CID 1241515.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agocompat/w32pthreads: use the condition variable API directly when targeting newer...
James Almer [Thu, 9 Oct 2014 20:49:22 +0000 (17:49 -0300)]
compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoFix writing first audio Cues in dash mode.
Frank Galligan [Thu, 9 Oct 2014 15:28:00 +0000 (08:28 -0700)]
Fix writing first audio Cues in dash mode.

In dahsmode Matroska is not writing the first Cluster for every
audio stream in the Cues element.

Signed-off-by: Frank Galligan <frankgalligan@gmail.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocompat/w32pthreads: use the CONDITION_VARIABLE typedef if available
James Almer [Thu, 9 Oct 2014 16:20:00 +0000 (13:20 -0300)]
compat/w32pthreads: use the CONDITION_VARIABLE typedef if available

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.

Tested-by: Matt Oliver <protogonoi@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavutil/softfloat: add some asserts
Michael Niedermayer [Thu, 9 Oct 2014 15:02:59 +0000 (17:02 +0200)]
avutil/softfloat: add some asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/softfloat: Fix dependence on signed overflow in av_normalize1_sf()
Michael Niedermayer [Thu, 9 Oct 2014 14:37:26 +0000 (16:37 +0200)]
avutil/softfloat: Fix dependence on signed overflow in av_normalize1_sf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/Makefile: add softfloat to TESTPROGS
Michael Niedermayer [Thu, 9 Oct 2014 14:02:14 +0000 (16:02 +0200)]
avutil/Makefile: add softfloat to TESTPROGS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: E-AC-3 streams need parsing too.
Benoit Fouet [Thu, 9 Oct 2014 07:17:49 +0000 (09:17 +0200)]
avformat/mov: E-AC-3 streams need parsing too.

syncframes in E-AC-3 can be combined to provide 6 audio blocks per
sample, thus requiring parsing for proper decoding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: fix 2GB file seek limit on Android
Yu Xiaolei [Thu, 9 Oct 2014 02:49:43 +0000 (10:49 +0800)]
lavf: fix 2GB file seek limit on Android

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2bc220958c7570020d87ee353db65460b518998a'
Michael Niedermayer [Thu, 9 Oct 2014 10:25:52 +0000 (12:25 +0200)]
Merge commit '2bc220958c7570020d87ee353db65460b518998a'

* commit '2bc220958c7570020d87ee353db65460b518998a':
  ismindex: handle discontinuous streams better

Conflicts:
tools/ismindex.c

See: d3834f290138cb8c48fd404081ac5b9a2ca14564
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoismindex: handle discontinuous streams better
Mika Raento [Wed, 8 Oct 2014 06:39:26 +0000 (09:39 +0300)]
ismindex: handle discontinuous streams better

Reads the fragment duration from the trun sample data, rather than
assuming that there are no gaps. Creates much better playlists for our
inputs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoismindex: handle discontinuous streams better
Mika Raento [Wed, 8 Oct 2014 06:39:26 +0000 (09:39 +0300)]
ismindex: handle discontinuous streams better

Read the fragment duration from the trun sample data, rather than
assuming that there are no gaps.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/mov: Fix 'warning: format specifies type unsigned short but the argument...
Michael Niedermayer [Thu, 9 Oct 2014 03:49:25 +0000 (05:49 +0200)]
avformat/mov: Fix 'warning: format specifies type unsigned short but the argument has type int'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Fix "warning: pointer type mismatch in conditional expression"
Michael Niedermayer [Thu, 9 Oct 2014 03:46:13 +0000 (05:46 +0200)]
avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dump: use format dump_separator if the codec one is not set
Michael Niedermayer [Thu, 9 Oct 2014 02:29:42 +0000 (04:29 +0200)]
avformat/dump: use format dump_separator if the codec one is not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.
Michael Niedermayer [Thu, 9 Oct 2014 03:16:45 +0000 (05:16 +0200)]
avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofix seperator typo
Michael Niedermayer [Thu, 9 Oct 2014 02:19:13 +0000 (04:19 +0200)]
fix seperator typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'
Michael Niedermayer [Thu, 9 Oct 2014 00:54:48 +0000 (02:54 +0200)]
Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'

* commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7':
  vc1: initialize color properties

See: ddabecbbf5509325c6c695ccc60d67c0af2065f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'
Michael Niedermayer [Thu, 9 Oct 2014 00:45:38 +0000 (02:45 +0200)]
Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'

* commit 'eddf95283fbba1b469b76e7518bc3941f671b193':
  vp9: initialize color space and range properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'
Michael Niedermayer [Thu, 9 Oct 2014 00:36:16 +0000 (02:36 +0200)]
Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'

* commit '65875a8b3b079752da25a61ec188d2e3d90a569f':
  vp8: initialize color space and range properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'
Michael Niedermayer [Thu, 9 Oct 2014 00:23:32 +0000 (02:23 +0200)]
Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'

* commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6':
  mov: support the Color Parameter Atoms 'colr'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'
Michael Niedermayer [Thu, 9 Oct 2014 00:22:56 +0000 (02:22 +0200)]
Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'

* commit '586ea0379c207a942c1f2d61e0b3a63c458cc598':
  avcodec: fix colorspace option description

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'
Michael Niedermayer [Thu, 9 Oct 2014 00:14:54 +0000 (02:14 +0200)]
Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'

* commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b':
  avcodec: add enum values on chroma sample location

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'
Michael Niedermayer [Thu, 9 Oct 2014 00:13:37 +0000 (02:13 +0200)]
Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'

* commit '9d5fed6dc4cccb0689f694112f5026988bebc472':
  avcodec: fix descriptions on color transfer options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '167e6f1489368a4693145da61cb022c113a285bc'
Michael Niedermayer [Wed, 8 Oct 2014 23:56:30 +0000 (01:56 +0200)]
Merge commit '167e6f1489368a4693145da61cb022c113a285bc'

* commit '167e6f1489368a4693145da61cb022c113a285bc':
  dump: Update streams and chapters printout format

See: cab2860c8a49756daccde3111eb27271209495cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'
Michael Niedermayer [Wed, 8 Oct 2014 23:45:44 +0000 (01:45 +0200)]
Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'

* commit '9f3a70c44224ed92d91df65bb9470a2649e7d019':
  dump: print the original coded dimensions when available

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f'
Michael Niedermayer [Wed, 8 Oct 2014 23:03:55 +0000 (01:03 +0200)]
Merge commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f'

* commit '41e86146e7240f9d42e8cdb86a94bb3eb2bbe15f':
  dump: print detailed color space information

full color triplets are only printed if they are not all equal, otherwise
they are printed as before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: Allow choosing the dump format field separator.
Michael Niedermayer [Wed, 8 Oct 2014 21:48:32 +0000 (23:48 +0200)]
avformat: Allow choosing the dump format field separator.

The default is to maintain the previous ", " for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: Allow choosing the dump format field separator.
Michael Niedermayer [Wed, 8 Oct 2014 21:48:32 +0000 (23:48 +0200)]
avcodec: Allow choosing the dump format field separator.

The default is to maintain the previous ", " for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'
Michael Niedermayer [Wed, 8 Oct 2014 21:33:24 +0000 (23:33 +0200)]
Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'

* commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8':
  dump: split audio and video probing on multiple lines

Conflicts:
libavcodec/utils.c
libavformat/dump.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'
Michael Niedermayer [Wed, 8 Oct 2014 20:53:48 +0000 (22:53 +0200)]
Merge commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4'

* commit '5a419b2dd1881889d436f55741fd3ff3f9f436c4':
  pixdesc: return color properties names

Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'
Michael Niedermayer [Wed, 8 Oct 2014 20:37:59 +0000 (22:37 +0200)]
Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'

* commit '04ccd584a70fad4ebb29ca340d704970ff313cbc':
  pixfmt: mark further reserved values

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c732c62cee43f651775af5547cff99d418248542'
Michael Niedermayer [Wed, 8 Oct 2014 20:28:23 +0000 (22:28 +0200)]
Merge commit 'c732c62cee43f651775af5547cff99d418248542'

* commit 'c732c62cee43f651775af5547cff99d418248542':
  doc: expand description for some color properties

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'
Michael Niedermayer [Wed, 8 Oct 2014 20:20:33 +0000 (22:20 +0200)]
Merge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'

* commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6':
  avprobe: print color properties for show_streams

Conflicts:
avprobe.c

Not merged as this code does not build and is incomplete, some parts only
appear in later commits.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'
Michael Niedermayer [Wed, 8 Oct 2014 20:06:21 +0000 (22:06 +0200)]
Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'

* commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659':
  avcodec: make sure color_range is properly initialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
Michael Niedermayer [Wed, 8 Oct 2014 19:58:42 +0000 (21:58 +0200)]
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'

* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
  vc1: Split the decoder in components

Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'
Michael Niedermayer [Wed, 8 Oct 2014 19:45:41 +0000 (21:45 +0200)]
Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'

* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
  avformat: bump version after mime_type change

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'
Michael Niedermayer [Wed, 8 Oct 2014 19:35:40 +0000 (21:35 +0200)]
Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'

* commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7':
  avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

Conflicts:
libavformat/format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskadec: do not trust the default duration to be the real 1/timebase...
Michael Niedermayer [Wed, 8 Oct 2014 18:23:40 +0000 (20:23 +0200)]
avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps

Fixes Ticket3980

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovc1: initialize color properties
Vittorio Giovara [Sun, 5 Oct 2014 21:58:50 +0000 (22:58 +0100)]
vc1: initialize color properties

4 years agovp9: initialize color space and range properties
Vittorio Giovara [Sun, 5 Oct 2014 21:58:50 +0000 (22:58 +0100)]
vp9: initialize color space and range properties

4 years agovp8: initialize color space and range properties
Vittorio Giovara [Sun, 5 Oct 2014 21:58:50 +0000 (22:58 +0100)]
vp8: initialize color space and range properties

4 years agomov: support the Color Parameter Atoms 'colr'
Vittorio Giovara [Thu, 2 Oct 2014 13:28:35 +0000 (14:28 +0100)]
mov: support the Color Parameter Atoms 'colr'

4 years agoavcodec: fix colorspace option description
Vittorio Giovara [Tue, 30 Sep 2014 13:51:23 +0000 (14:51 +0100)]
avcodec: fix colorspace option description

4 years agoavcodec: add enum values on chroma sample location
Marc-Antoine Arnaud [Tue, 23 Sep 2014 14:17:42 +0000 (16:17 +0200)]
avcodec: add enum values on chroma sample location

4 years agoavcodec: fix descriptions on color transfer options
Marc-Antoine Arnaud [Tue, 23 Sep 2014 14:16:19 +0000 (16:16 +0200)]
avcodec: fix descriptions on color transfer options

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodump: Update streams and chapters printout format
Sylvain Rabot [Tue, 30 Sep 2014 09:26:06 +0000 (11:26 +0200)]
dump: Update streams and chapters printout format

This matches the -map option which requires '%d:%d' format.

4 years agodump: print the original coded dimensions when available
Vittorio Giovara [Fri, 26 Sep 2014 14:24:07 +0000 (15:24 +0100)]
dump: print the original coded dimensions when available

4 years agodump: print detailed color space information
Vittorio Giovara [Fri, 26 Sep 2014 14:24:01 +0000 (15:24 +0100)]
dump: print detailed color space information

4 years agodump: split audio and video probing on multiple lines
Vittorio Giovara [Fri, 26 Sep 2014 13:37:40 +0000 (14:37 +0100)]
dump: split audio and video probing on multiple lines

Also always report pixel format.

4 years agopixdesc: return color properties names
Vittorio Giovara [Fri, 26 Sep 2014 13:15:25 +0000 (14:15 +0100)]
pixdesc: return color properties names

4 years agopixfmt: mark further reserved values
Vittorio Giovara [Fri, 26 Sep 2014 12:14:37 +0000 (13:14 +0100)]
pixfmt: mark further reserved values

4 years agodoc: expand description for some color properties
Vittorio Giovara [Mon, 29 Sep 2014 13:27:47 +0000 (14:27 +0100)]
doc: expand description for some color properties

4 years agoavprobe: print color properties for show_streams
Vittorio Giovara [Fri, 3 Oct 2014 17:18:55 +0000 (18:18 +0100)]
avprobe: print color properties for show_streams

4 years agoavcodec: make sure color_range is properly initialized
Vittorio Giovara [Fri, 26 Sep 2014 15:07:55 +0000 (16:07 +0100)]
avcodec: make sure color_range is properly initialized

4 years agovc1: Split the decoder in components
Luca Barbato [Wed, 16 Jul 2014 18:18:20 +0000 (20:18 +0200)]
vc1: Split the decoder in components

Speed up the overall compilation time.

4 years agoavformat: bump version after mime_type change
Vittorio Giovara [Wed, 8 Oct 2014 14:52:51 +0000 (15:52 +0100)]
avformat: bump version after mime_type change

4 years agoChangelog: add "ffprobe -show_pixel_formats option"
Tobias Rapp [Wed, 8 Oct 2014 07:59:23 +0000 (09:59 +0200)]
Changelog: add "ffprobe -show_pixel_formats option"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/Makefile: Fix fate-ffprobe with --target-path
Carl Eugen Hoyos [Fri, 3 Oct 2014 10:59:14 +0000 (12:59 +0200)]
tests/Makefile: Fix fate-ffprobe with --target-path

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: use const char* instead of uint8_t* for AVProbeData.mime_type
Andreas Cadhalpun [Tue, 30 Sep 2014 10:40:36 +0000 (11:40 +0100)]
avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

This makes the field consistent with AVInputFormat.mime_type and the
argument type of av_match_name.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavcodec/avpicture: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Wed, 8 Oct 2014 14:09:31 +0000 (16:09 +0200)]
avcodec/avpicture: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/atrac3plusdec: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Wed, 8 Oct 2014 14:09:05 +0000 (16:09 +0200)]
avcodec/atrac3plusdec: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/bfi: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Wed, 8 Oct 2014 14:08:28 +0000 (16:08 +0200)]
avcodec/bfi: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Wed, 8 Oct 2014 13:22:24 +0000 (15:22 +0200)]
ffserver: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vorbisdec: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Wed, 8 Oct 2014 13:17:08 +0000 (15:17 +0200)]
avcodec/vorbisdec: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2d91abade29e43bb45c881d45909b8ee77e904e2'
Michael Niedermayer [Wed, 8 Oct 2014 09:48:46 +0000 (11:48 +0200)]
Merge commit '2d91abade29e43bb45c881d45909b8ee77e904e2'

* commit '2d91abade29e43bb45c881d45909b8ee77e904e2':
  x86: h264_intrapred: Don't treat 32-bit integers as 64-bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae'
Michael Niedermayer [Wed, 8 Oct 2014 09:39:28 +0000 (11:39 +0200)]
Merge commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae'

* commit '82f8eb5f773d87e3d9c0066ef19b501a461ddfae':
  jpeg2000: split off inverse MCT as Jpeg2000DSP

Conflicts:
libavcodec/Makefile
libavcodec/jpeg2000dec.c
libavcodec/jpeg2000dsp.c
libavcodec/jpeg2000dsp.h

See: c9f2ec8a3464718641742a105179f828ccbfb392
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: h264_intrapred: Don't treat 32-bit integers as 64-bit
Henrik Gramner [Wed, 1 Oct 2014 17:03:29 +0000 (19:03 +0200)]
x86: h264_intrapred: Don't treat 32-bit integers as 64-bit

The upper halves are not guaranteed to be zero in x86-64.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agojpeg2000: split off inverse MCT as Jpeg2000DSP
James Almer [Thu, 2 Oct 2014 17:08:01 +0000 (14:08 -0300)]
jpeg2000: split off inverse MCT as Jpeg2000DSP

This makes the addition of arch optimized functions easier.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavcodec/h264: Undefined behavior (left shift of 12852653 by 8 places cannot be repres...
Michael Niedermayer [Wed, 8 Oct 2014 02:23:03 +0000 (04:23 +0200)]
avcodec/h264: Undefined behavior (left shift of 12852653 by 8 places cannot be represented in type 'int')

Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/audioconvert: Fix undefined behavior (left shift of negative value)
Michael Niedermayer [Wed, 8 Oct 2014 02:18:27 +0000 (04:18 +0200)]
swresample/audioconvert: Fix undefined behavior (left shift of negative value)

Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mmvideo: Fix undefined behavior (left shift of negative value)
Michael Niedermayer [Wed, 8 Oct 2014 02:12:26 +0000 (04:12 +0200)]
avcodec/mmvideo: Fix undefined behavior (left shift of negative value)

Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: add pixel format chroma sub-sampling output
Tobias Rapp [Mon, 15 Sep 2014 15:16:03 +0000 (17:16 +0200)]
ffprobe: add pixel format chroma sub-sampling output

Adds output of chroma sub-sampling information to
ffprobe -show_pixel_formats option.

Note: This patch just prints the "raw" log2_charoma_w/h values instead
of the previously suggested mapping into a chroma sub-sampling pattern
string like "4:2:2".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: add pixel format component bit depth output
Tobias Rapp [Mon, 15 Sep 2014 15:15:42 +0000 (17:15 +0200)]
ffprobe: add pixel format component bit depth output

Adds output of bit depth per pixel format component to
ffprobe -show_pixel_formats option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: add pixel format flags output
Tobias Rapp [Mon, 15 Sep 2014 15:15:17 +0000 (17:15 +0200)]
ffprobe: add pixel format flags output

Adds output of pixel format flags to ffprobe -show_pixel_formats option.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: add -show_pixel_formats option
Tobias Rapp [Thu, 11 Sep 2014 07:16:52 +0000 (09:16 +0200)]
ffprobe: add -show_pixel_formats option

Adds option -show_pixel_formats to ffprobe which lists all
available pixel formats with some details.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: add w/h parameters in timeline
Clément Bœsch [Mon, 6 Oct 2014 11:04:26 +0000 (13:04 +0200)]
avfilter: add w/h parameters in timeline

Fixes Ticket #4008.

4 years agoavformat/tiertexseq: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 7 Oct 2014 11:44:26 +0000 (13:44 +0200)]
avformat/tiertexseq: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_adelay: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 7 Oct 2014 11:44:26 +0000 (13:44 +0200)]
avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9a03c2323593173a201cb75edd1b49887cf811ed'
Michael Niedermayer [Tue, 7 Oct 2014 10:49:38 +0000 (12:49 +0200)]
Merge commit '9a03c2323593173a201cb75edd1b49887cf811ed'

* commit '9a03c2323593173a201cb75edd1b49887cf811ed':
  h263dec: Force padding bug workaround for H.263.

This is not merged as it breaks a good part of the error concealment/resilience for H.263
Also, messenger.h263 plays fine in ffmpeg.
If anyone has any other h263 files that do not work, please open an issue on trak or
mail me!

See: d225b0f7aaa65eafccc87165130e1c4bab71708b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec'
Michael Niedermayer [Tue, 7 Oct 2014 10:29:07 +0000 (12:29 +0200)]
Merge commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec'

* commit 'd208d1eba3799c58fd6d3602d31de3e686f14aec':
  hevc_mvs: make sure to always initialize the temporal MV fully

Conflicts:
libavcodec/hevc_mvs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '79a60c8e779242b5ba4c531b2c706c871e8e6420'
Michael Niedermayer [Tue, 7 Oct 2014 10:10:50 +0000 (12:10 +0200)]
Merge commit '79a60c8e779242b5ba4c531b2c706c871e8e6420'

* commit '79a60c8e779242b5ba4c531b2c706c871e8e6420':
  hevc_mvs: initialize the temporal MV in case of missing ref

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh263dec: Force padding bug workaround for H.263.
Josh Allmann [Fri, 3 Oct 2014 16:42:25 +0000 (09:42 -0700)]
h263dec: Force padding bug workaround for H.263.

Fixes decoding of http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agohevc_mvs: make sure to always initialize the temporal MV fully
Anton Khirnov [Mon, 29 Sep 2014 16:25:14 +0000 (16:25 +0000)]
hevc_mvs: make sure to always initialize the temporal MV fully

The spec requires this.

Fixes uninitialized reads on some samples.

Remove now unnecessary initialization of the whole merge candidate list.

4 years agohevc_mvs: initialize the temporal MV in case of missing ref
Anton Khirnov [Mon, 29 Sep 2014 16:16:50 +0000 (16:16 +0000)]
hevc_mvs: initialize the temporal MV in case of missing ref

The caller expects the MV to always be initialized.

4 years agoavformat/hls: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 7 Oct 2014 02:29:27 +0000 (04:29 +0200)]
avformat/hls: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/escape124: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 7 Oct 2014 01:40:57 +0000 (03:40 +0200)]
avcodec/escape124: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/proresenc_kostya: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 7 Oct 2014 01:40:57 +0000 (03:40 +0200)]
avcodec/proresenc_kostya: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/avpacket: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Tue, 7 Oct 2014 01:40:57 +0000 (03:40 +0200)]
avcodec/avpacket: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/avpacket: simplify freeing pkt->data
Michael Niedermayer [Tue, 7 Oct 2014 01:40:15 +0000 (03:40 +0200)]
avcodec/avpacket: simplify freeing pkt->data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfdec: read reel_name and source timecode from physical source package
Mark Reid [Sun, 5 Oct 2014 00:42:51 +0000 (17:42 -0700)]
avformat/mxfdec: read reel_name and source timecode from physical source package

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '28816050e47b6dba430a52e429d21a864cffda8e'
Michael Niedermayer [Tue, 7 Oct 2014 00:51:08 +0000 (02:51 +0200)]
Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'

* commit '28816050e47b6dba430a52e429d21a864cffda8e':
  lavf: Set the stream time base hint properly for chained muxers

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'
Michael Niedermayer [Tue, 7 Oct 2014 00:39:58 +0000 (02:39 +0200)]
Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'

* commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7':
  sdp: Simplify parsing/conversion of H264 extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '153fadc390d05aa47e5e2c56290401898fe41a23'
Michael Niedermayer [Tue, 7 Oct 2014 00:15:07 +0000 (02:15 +0200)]
Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23'

* commit '153fadc390d05aa47e5e2c56290401898fe41a23':
  ff_get_format: fix infinite loop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: Set the stream time base hint properly for chained muxers
Martin Storsjö [Mon, 6 Oct 2014 08:41:33 +0000 (11:41 +0300)]
lavf: Set the stream time base hint properly for chained muxers

This avoids warnings about using the codec time base as time
base hint.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agosdp: Simplify parsing/conversion of H264 extradata
Martin Storsjö [Fri, 3 Oct 2014 17:49:01 +0000 (20:49 +0300)]
sdp: Simplify parsing/conversion of H264 extradata

By using ff_avc_write_annexb_extradata instead of the h264_mp4toannexb
BSF, the code for doing the conversion itself is kept much shorter,
there's less state to restore at the end, we don't risk leaving the
AVCodecContext in an inconsistent state if returning early due to
errors, etc.

Also add a missing free if the base64 encoding fails.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '577899a6458ccad9026eb268f10dc0b39c224c8d'
Michael Niedermayer [Mon, 6 Oct 2014 19:08:55 +0000 (21:08 +0200)]
Merge commit '577899a6458ccad9026eb268f10dc0b39c224c8d'

* commit '577899a6458ccad9026eb268f10dc0b39c224c8d':
  lavc: specify the behavior of av_lockmgr_register on failure.

Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h

See: a950edb472e8823e34832c7313ba447b2db76f27
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoff_get_format: fix infinite loop
Rémi Denis-Courmont [Mon, 6 Oct 2014 14:41:00 +0000 (17:41 +0300)]
ff_get_format: fix infinite loop

Signed-off-by: Anton Khirnov <anton@khirnov.net>