diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 01:04:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 01:16:47 +0100 |
| commit | f455c8fdef0a28facff05b509b0958ffb9604e10 (patch) | |
| tree | d22b5ca1a16267c2d7e10a99a3652cc8e0b6e3d0 /ffmpeg.c | |
| parent | 98d19ca8f18901b89aae66dc11c20f5a3a39d7b5 (diff) | |
| parent | 88b160a457e491cb9e014630ef5387ad3500258e (diff) | |
| download | ffmpeg-f455c8fdef0a28facff05b509b0958ffb9604e10.tar.gz | |
Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'
* commit '88b160a457e491cb9e014630ef5387ad3500258e':
avfilter: Return more meaningful error codes
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions