diff options
| author | Michael Niedermayer <[email protected]> | 2015-05-12 12:06:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-05-12 12:07:19 +0200 |
| commit | 85bbe1dbd1cc2e72ea30958af9115b727e958b99 (patch) | |
| tree | 5037671d3249a9ddcb072895524c1732669871dc /libavformat/rtpenc_jpeg.c | |
| parent | acf4925f444636a828534ab47d0f86c21a7a9b4e (diff) | |
| parent | 0670acc4f1c4ceb16968818a654e07a3f550a8c9 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat/rtpenc_jpeg.c')
0 files changed, 0 insertions, 0 deletions