summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-12 12:06:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-12 12:07:19 +0200
commit85bbe1dbd1cc2e72ea30958af9115b727e958b99 (patch)
tree5037671d3249a9ddcb072895524c1732669871dc /tests
parentacf4925f444636a828534ab47d0f86c21a7a9b4e (diff)
parent0670acc4f1c4ceb16968818a654e07a3f550a8c9 (diff)
downloadffmpeg-streaming-85bbe1dbd1cc2e72ea30958af9115b727e958b99.zip
ffmpeg-streaming-85bbe1dbd1cc2e72ea30958af9115b727e958b99.tar.gz
Merge commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9'
* commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9': dca_parser: Extend DTS core sync word and fix existing check Conflicts: libavcodec/dca_parser.c See: e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud