55 Commits

Author	SHA1	Message	Date
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