f3b54ee989
avutil/Makefile: add softfloat to TESTPROGS
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 16:02:14 +02:00
7cda31cb92
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>
2014-10-09 15:38:09 +02:00
d5a6f11272
lavf: fix 2GB file seek limit on Android
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 13:08:33 +02:00
7b973e7341
Merge commit '2bc220958c7570020d87ee353db65460b518998a'
...
* commit '2bc220958c7570020d87ee353db65460b518998a':
ismindex: handle discontinuous streams better
Conflicts:
tools/ismindex.c
See: d3834f2901
2014-10-09 12:25:52 +02:00
d3834f2901
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>
2014-10-09 12:15:48 +02:00
2bc220958c
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>
2014-10-09 11:21:49 +03:00
5d36e8527f
avformat/mov: Fix 'warning: format specifies type unsigned short but the argument has type int'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 05:49:25 +02:00
8cfb9ccfef
avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 05:46:13 +02:00
0578623039
avformat/dump: use format dump_separator if the codec one is not set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 05:41:42 +02:00
f9a1317479
avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 05:28:10 +02:00
cf7b90dea2
fix seperator typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 04:19:13 +02:00
f6777ce6fe
Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'
...
* commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7':
vc1: initialize color properties
See: ddabecbbf5
2014-10-09 03:06:20 +02:00
5b134a0544
Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'
...
* commit 'eddf95283fbba1b469b76e7518bc3941f671b193':
vp9: initialize color space and range properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:49:16 +02:00
3bc86462a2
Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'
...
* commit '65875a8b3b079752da25a61ec188d2e3d90a569f':
vp8: initialize color space and range properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:36:58 +02:00
349a32c436
Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'
...
* commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6':
mov: support the Color Parameter Atoms 'colr'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:27:53 +02:00
6414c3ecd0
Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'
...
* commit '586ea0379c207a942c1f2d61e0b3a63c458cc598':
avcodec: fix colorspace option description
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:23:15 +02:00
923a242282
Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'
...
* commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b':
avcodec: add enum values on chroma sample location
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:14:54 +02:00
7652b176fc
Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'
...
* commit '9d5fed6dc4cccb0689f694112f5026988bebc472':
avcodec: fix descriptions on color transfer options
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:14:23 +02:00
04d8f616fd
Merge commit '167e6f1489368a4693145da61cb022c113a285bc'
...
* commit '167e6f1489368a4693145da61cb022c113a285bc':
dump: Update streams and chapters printout format
See: cab2860c8a
2014-10-09 02:11:04 +02:00
5f43a7957b
Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'
...
* commit '9f3a70c44224ed92d91df65bb9470a2649e7d019':
dump: print the original coded dimensions when available
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 01:46:26 +02:00
af28960412
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>
2014-10-09 01:26:34 +02:00
f0a6874de8
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>
2014-10-09 00:56:58 +02:00
e051d09c58
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>
2014-10-09 00:56:31 +02:00
f22f873ef0
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>
2014-10-09 00:56:23 +02:00
bb44f7d5d7
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>
2014-10-08 22:53:48 +02:00
7eb959bf0b
Merge commit '04ccd584a70fad4ebb29ca340d704970ff313cbc'
...
* commit '04ccd584a70fad4ebb29ca340d704970ff313cbc':
pixfmt: mark further reserved values
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08 22:37:59 +02:00
1b6172dcf6
Merge commit 'c732c62cee43f651775af5547cff99d418248542'
...
* commit 'c732c62cee43f651775af5547cff99d418248542':
doc: expand description for some color properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08 22:28:45 +02:00
dc5560efda
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>
2014-10-08 22:20:33 +02:00
10dd62737e
Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'
...
* commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659':
avcodec: make sure color_range is properly initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08 22:08:11 +02:00
d5a3caef93
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
...
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08 22:00:09 +02:00
9da679e77f
Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'
...
* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
avformat: bump version after mime_type change
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08 21:45:41 +02:00
911ba8fb19
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>
2014-10-08 21:35:40 +02:00
be695ee389
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>
2014-10-08 20:39:37 +02:00
1a02e78653
vc1: initialize color properties
2014-10-08 18:17:50 +01:00
eddf95283f
vp9: initialize color space and range properties
2014-10-08 18:17:50 +01:00
65875a8b3b
vp8: initialize color space and range properties
2014-10-08 18:17:50 +01:00
0d8a3656ba
mov: support the Color Parameter Atoms 'colr'
2014-10-08 18:17:50 +01:00
586ea0379c
avcodec: fix colorspace option description
2014-10-08 18:17:50 +01:00
91eef40203
avcodec: add enum values on chroma sample location
2014-10-08 18:17:50 +01:00
9d5fed6dc4
avcodec: fix descriptions on color transfer options
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-10-08 18:17:49 +01:00
167e6f1489
dump: Update streams and chapters printout format
...
This matches the -map option which requires '%d:%d' format.
2014-10-08 18:17:49 +01:00
9f3a70c442
dump: print the original coded dimensions when available
2014-10-08 18:17:49 +01:00
41e86146e7
dump: print detailed color space information
2014-10-08 18:17:49 +01:00
20a5956b8d
dump: split audio and video probing on multiple lines
...
Also always report pixel format.
2014-10-08 18:17:49 +01:00
5a419b2dd1
pixdesc: return color properties names
2014-10-08 18:17:49 +01:00
04ccd584a7
pixfmt: mark further reserved values
2014-10-08 18:17:49 +01:00
c732c62cee
doc: expand description for some color properties
2014-10-08 18:17:49 +01:00
a2c00d22e7
avprobe: print color properties for show_streams
2014-10-08 18:17:49 +01:00
147f2e91ee
avcodec: make sure color_range is properly initialized
2014-10-08 18:17:49 +01:00
04d14c9b68
vc1: Split the decoder in components
...
Speed up the overall compilation time.
2014-10-08 18:34:48 +02:00
Michael Niedermayer
Benoit Fouet
Yu Xiaolei
Mika Raento
Vittorio Giovara
Marc-Antoine Arnaud
Sylvain Rabot
Luca Barbato