Michael Niedermayer
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
Michael Niedermayer
04d8f616fd
Merge commit ' 167e6f1489
'
...
* commit '167e6f1489
':
dump: Update streams and chapters printout format
See: cab2860c8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09 02:11:04 +02:00
Michael Niedermayer
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
Michael Niedermayer
f22f873ef0
Merge commit ' 20a5956b8d
'
...
* commit '20a5956b8d
':
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
Sylvain Rabot
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
Vittorio Giovara
20a5956b8d
dump: split audio and video probing on multiple lines
...
Also always report pixel format.
2014-10-08 18:17:49 +01:00
Michael Niedermayer
f30a8154ab
Merge commit ' 9301486408
'
...
* commit '9301486408
':
avcodec: add stream-level stereo3d side data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 22:23:01 +02:00
Vittorio Giovara
9301486408
avcodec: add stream-level stereo3d side data
2014-08-28 12:33:26 -04:00
Michael Niedermayer
60831f441d
Merge commit ' 59ca29a560
'
...
* commit '59ca29a560
':
dump: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:41:00 +02:00
Diego Biurrun
59ca29a560
dump: Use correct printf conversion specifiers for POSIX int types
2014-07-28 13:19:04 -07:00
Michael Niedermayer
af75a85599
Merge commit ' 3f4edf0125
'
...
* commit '3f4edf0125
':
dump_stream: print the timebase as is, do not reduce it
See: 75511c293a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26 21:03:21 +02:00
Anton Khirnov
3f4edf0125
dump_stream: print the timebase as is, do not reduce it
...
It makes more sense to print the timebase exactly as it is set. Also,
this avoids a divide by zero when av_dump_format() is called on a format
context before writing the header.
2014-06-26 16:04:22 +02:00
Michael Niedermayer
75511c293a
dump_stream_format: fix division by 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 19:49:23 +02:00
Michael Niedermayer
f0fbd9105b
Merge commit ' 711aa2a827
'
...
* commit '711aa2a827
':
lavf: dump stream side data when probing
Conflicts:
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:54:36 +02:00
Michael Niedermayer
7b7afaf849
avformat/dump: put copyright back from the file from which dump.c was split out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:48:19 +02:00
Michael Niedermayer
83d100baea
Merge commit ' 2dc265619a
'
...
* commit '2dc265619a
':
lavf: group dump functions together
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:48:03 +02:00
Vittorio Giovara
711aa2a827
lavf: dump stream side data when probing
2014-06-14 00:25:26 -04:00
Vittorio Giovara
2dc265619a
lavf: group dump functions together
2014-06-14 00:24:35 -04:00