diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 10:36:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 11:19:03 +0200 |
| commit | 7a342f97c48f529d93aa46e572944d279c1dd697 (patch) | |
| tree | c2067a6b1da721251f351c6e23d662ec138ef8f6 /libavfilter/asrc_flite.c | |
| parent | bd71071066602a9aa542286829f33eddc9bec615 (diff) | |
| parent | 5ef7c84a9374681c64722a96d91741f3b990af2b (diff) | |
| download | ffmpeg-7a342f97c48f529d93aa46e572944d279c1dd697.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxa: Make sure the reference frame exists
See: 12eb2fd5394813a6119912b22f5dfc17b4a6b4a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asrc_flite.c')
0 files changed, 0 insertions, 0 deletions