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