diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-22 21:11:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-22 21:12:02 +0100 |
| commit | 246eae98cfe4eee9c3a812962b3af51749c59fa8 (patch) | |
| tree | cfc5eee22e1ae8bc5e9d55445a6af13fb7b7e4f3 /libavfilter/avfilter.c | |
| parent | 5367c0be623885eb0fcd0542564150d79d881a1c (diff) | |
| parent | 1db03a68641193832fc759c88049adbe8a449310 (diff) | |
| download | ffmpeg-246eae98cfe4eee9c3a812962b3af51749c59fa8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: return an error if a avresample_open() is called on an open context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
0 files changed, 0 insertions, 0 deletions