virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
65,905 Commits 37 Branches 400 Tags 460 MiB
bf16872fec
Commit Graph

10 Commits

Author SHA1 Message Date
Michael Niedermayer
60831f441d Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4' 
* commit '59ca29a560ba0cfe97457de8cedf77db434f0de4':
  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 '3f4edf012593c73941caa0ef9b292da00225c3df' 
* commit '3f4edf012593c73941caa0ef9b292da00225c3df':
  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 '711aa2a82727907f778fb8aa9a93aff2120170f2' 
* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  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 '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb' 
* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
  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