aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/spdifenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-09 12:25:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-09 12:25:52 +0200
commit7b973e734111caccc737fcc6d1ed5a6a111c8831 (patch)
treea346a6328e05a818729d37f07c11e5630e859e22 /libavformat/spdifenc.c
parentd3834f290138cb8c48fd404081ac5b9a2ca14564 (diff)
parent2bc220958c7570020d87ee353db65460b518998a (diff)
downloadffmpeg-7b973e734111caccc737fcc6d1ed5a6a111c8831.tar.gz
Merge commit '2bc220958c7570020d87ee353db65460b518998a'
* commit '2bc220958c7570020d87ee353db65460b518998a': ismindex: handle discontinuous streams better Conflicts: tools/ismindex.c See: d3834f290138cb8c48fd404081ac5b9a2ca14564 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/spdifenc.c')
0 files changed, 0 insertions, 0 deletions