diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 12:25:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 12:26:05 +0200 |
| commit | a1323ec1793b9800c1dce19de66afc28929e6eef (patch) | |
| tree | 535f5141450be8f152af7e7b82608dc9b0ea6f38 | |
| parent | 62355b25ad5cdeca4f7b0380fc5ccc8714073be1 (diff) | |
| parent | 8b9d0f5d3aceb67d472d190db53a21177fea9275 (diff) | |
| download | ffmpeg-a1323ec1793b9800c1dce19de66afc28929e6eef.tar.gz | |
Merge commit '8b9d0f5d3aceb67d472d190db53a21177fea9275' into release/2.2
* commit '8b9d0f5d3aceb67d472d190db53a21177fea9275':
mov: Fix little endian audio detection
Conflicts:
libavformat/mov.c
See: d2549ba9df1a1aac8c0ae19bfca2c81e508ba02e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions