diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 18:10:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 18:10:47 +0200 |
| commit | 0008a87cb14b7b5932d58578f06489dce5ef9484 (patch) | |
| tree | da11daaff98df52c5b4e703e7a429ed23d1e59d5 /libavutil/file_open.c | |
| parent | 2aa659233810cb17e4748a52298d018fa9cb8d4a (diff) | |
| parent | e780c3daafe0588e035e752c771ebfcd2201746a (diff) | |
| download | ffmpeg-0008a87cb14b7b5932d58578f06489dce5ef9484.tar.gz | |
Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2
* commit 'e780c3daafe0588e035e752c771ebfcd2201746a':
pcm-dvd: Fix 20bit decoding
Conflicts:
Changelog
See: 5db49fc38d9132e134de92584f296559bec3b789
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file_open.c')
0 files changed, 0 insertions, 0 deletions