diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-23 22:16:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-23 22:16:54 +0200 |
| commit | 802c0af68f22b0c3cd4ad3d29f5094e9377995de (patch) | |
| tree | 64f1d91ebd8974a383a66d17cefd9c6a77465d13 /libavcodec/alac.c | |
| parent | 8d31b22869f6a676fe4d1e34d74c0fa3b081421c (diff) | |
| parent | 358b7ec3099eca6e999ad9dc0da0a23571a7a2f8 (diff) | |
| download | ffmpeg-802c0af68f22b0c3cd4ad3d29f5094e9377995de.tar.gz | |
Merge commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8'
* commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8':
fate: Fix test name for pixfmts tests
Conflicts:
tests/fate-run.sh
See: e1ee0521a698809ed216e9e5c11bd2bbb466ed04
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alac.c')
0 files changed, 0 insertions, 0 deletions