diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 16:32:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 16:32:44 +0200 |
| commit | 4abb88d7e84208d86750091b3ec9082767ca74c1 (patch) | |
| tree | 1bfe6c37efeaee8fda5bdcf2155e5294eba9c8ac /libavfilter/vf_hqdn3d.c | |
| parent | 60924dfe5539d1f5ff29240f0995a15c23982b88 (diff) | |
| parent | 2bd67175c7e16c1f5da15c9e55ae6db4ab1d23fd (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_hqdn3d: Don't declare the loop variable within the for loop
huffyuv: update to current coding style
huffman: update to current coding style
rtsp: Free the rtpdec context properly
build: fft: x86: Drop unused YASM-OBJS-FFT- variable
Conflicts:
libavcodec/huffman.c
libavcodec/huffyuv.c
libavcodec/x86/Makefile
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_hqdn3d.c')
| -rw-r--r-- | libavfilter/vf_hqdn3d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 1eb9ba84a5..f7f42975d7 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -305,7 +305,7 @@ static int config_input(AVFilterLink *inlink) if (!hqdn3d->line) return AVERROR(ENOMEM); - for (i=0; i<4; i++) { + for (i = 0; i < 4; i++) { hqdn3d->coefs[i] = precalc_coefs(hqdn3d->strength[i], hqdn3d->depth); if (!hqdn3d->coefs[i]) return AVERROR(ENOMEM); |