diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-15 14:18:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-15 14:18:13 +0100 |
| commit | ac6cb666d92009bae92362d133c47a886fe46a7f (patch) | |
| tree | 7e53bd475f2e84e40e9dd579e17d18af71ff4069 /libavfilter/vf_mp.c | |
| parent | 54b0c04ae3a4073b9764358b925b0b73da3a9e09 (diff) | |
| parent | f33b5ba63eee96c9d1c7f0e568169cb0c3694238 (diff) | |
| download | ffmpeg-ac6cb666d92009bae92362d133c47a886fe46a7f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp56: release frames on error
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mp.c')
0 files changed, 0 insertions, 0 deletions