diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-01 12:29:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-01 12:48:04 +0200 |
| commit | 24f822c3ab99c33f59a5b181682e3fb507bfe35d (patch) | |
| tree | 69465e50765134e24518ee9a66d93a737da052ec /tools/bookmarklets.html | |
| parent | 7d057515818d606fd1d7ab9f0dc1eebf31a47239 (diff) | |
| parent | 0933fd1533560fbc718026e12f19a4824b041237 (diff) | |
| download | ffmpeg-24f822c3ab99c33f59a5b181682e3fb507bfe35d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
oma: Validate sample rates
Conflicts:
libavformat/oma.c
See: a30165c4a8044e1d5527c1302b5a5cb473e0913d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/bookmarklets.html')
0 files changed, 0 insertions, 0 deletions