diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:41:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:50:35 +0200 |
| commit | c188c10805aa62d0cdeb5b5ecfba5fa4aec9c47d (patch) | |
| tree | bad2d14019fd3868368abe3161a159c082fca0bb /libavcodec/fraps.c | |
| parent | c092af30088e42c2333ef0953f9dd2fdf76d3dee (diff) | |
| parent | 82e266c6d3fbf3cc74e515b883e66543381a0f2c (diff) | |
Merge commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c'
* commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c':
segafilm: Validate the number of audio channels
Merge only for metadata as the change is incorrect, checking audio
parameters in video only files
See: 192db16b9c202e8d037c4820b11e125d8010e7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fraps.c')
0 files changed, 0 insertions, 0 deletions