summaryrefslogtreecommitdiff
path: root/libavformat/dump.c
Commit message (Collapse)AuthorAge
* Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'Michael Niedermayer2014-08-28
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9301486408a480629336af4d7fd873c0f28fb2d5': 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>
| * avcodec: add stream-level stereo3d side dataVittorio Giovara2014-08-28
| |
* | Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | * commit '59ca29a560ba0cfe97457de8cedf77db434f0de4': dump: Use correct printf conversion specifiers for POSIX int types Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: Use correct printf conversion specifiers for POSIX int typesDiego Biurrun2014-07-28
| |
* | Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | * commit '3f4edf012593c73941caa0ef9b292da00225c3df': dump_stream: print the timebase as is, do not reduce it See: 75511c293add07db1cca58dcd8b08c33fc2f1075 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump_stream: print the timebase as is, do not reduce itAnton Khirnov2014-06-26
| | | | | | | | | | | | 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.
* | dump_stream_format: fix division by 0Michael Niedermayer2014-06-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'Michael Niedermayer2014-06-16
|\| | | | | | | | | | | | | | | | | | | * commit '711aa2a82727907f778fb8aa9a93aff2120170f2': lavf: dump stream side data when probing Conflicts: libavformat/dump.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: dump stream side data when probingVittorio Giovara2014-06-14
| |
* | avformat/dump: put copyright back from the file from which dump.c was split outMichael Niedermayer2014-06-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'Michael Niedermayer2014-06-16
|/ | | | | | | | | | * commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb': lavf: group dump functions together Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: group dump functions togetherVittorio Giovara2014-06-14