summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | lavfi/drawbox: restore verbal form for drawbox options descriptionsStefano Sabatini2013-05-17
| |
* | lavfi: factorize drawgrid and drawbox codeStefano Sabatini2013-05-17
| |
* | tools/ffhash: Use O_BINARY when availableJames Almer2013-05-17
| | | | | | | | | | | | | | This fixes reading files in Windows Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread: fix ffv1 with 2 threadsMichael Niedermayer2013-05-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/img2enc: use FF_CEIL_RSHIFT().Clément Bœsch2013-05-16
| |
* | lavfi/yadif: fix chroma subsampling with odd sizes.Clément Bœsch2013-05-16
| |
* | lavfi/idet: fix chroma subsampling with odd sizes.Clément Bœsch2013-05-16
| |
* | lavc/vc1dec: fix a few "may be used uninitialized" warnings.Clément Bœsch2013-05-16
| |
* | libvpxenc: Fix "passing argument 3 of av_image_copy from incompatible ↵Michael Niedermayer2013-05-16
| | | | | | | | | | | | pointer type" warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: silence "may be used uninitialized in this function" warning from gccMichael Niedermayer2013-05-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: silence a discarded const qualifier warning.Clément Bœsch2013-05-16
| |
* | Rename ffadler to ffhash and expand it using the generic hash APIJames Almer2013-05-16
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: sparc: Eliminate dead code in VIS acceleration macros flacdec: drop unnecessary assert mjpegdec: properly report unsupported disabled features Conflicts: libavcodec/flacdec.c libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sparc: Eliminate dead code in VIS acceleration macrosMichael Kostylev2013-05-16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * flacdec: drop unnecessary assertLuca Barbato2013-05-16
| | | | | | | | The condition cannot happen anymore.
| * mjpegdec: properly report unsupported disabled featuresLuca Barbato2013-05-16
| | | | | | | | | | | | | | | | When JPEG-LS support is disabled the decoder would feed the data to the JPEG Lossless decode_*_scan function resulting in faulty decoding. CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_pad: use the name 's' for the pointer to the private context vf_overlay: use the name 's' for the pointer to the private context vf_lut: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_pad: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_overlay: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_lut: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
* | Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8': vf_libopencv: use the name 's' for the pointer to the private context vf_hqdn3d: use the name 's' for the pointer to the private context vf_hflip: use the name 's' for the pointer to the private context vf_gradfun: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_libopencv: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_hqdn3d: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_hflip: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_gradfun: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
* | Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8': vf_frei0r: use the name 's' for the pointer to the private context vf_format: use the name 's' for the pointer to the private context vf_fieldorder: use the name 's' for the pointer to the private context vf_fieldorder: cosmetics, remove an extra linebreak Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_format: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_fieldorder: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_fieldorder: cosmetics, remove an extra linebreakAnton Khirnov2013-05-16
| |
* | lavfi/unsharp: remove unused float.h include.Clément Bœsch2013-05-16
| |
* | lavfi/unsharp: use av_image_copy_plane().Clément Bœsch2013-05-16
| |
* | fate/colorchannelmixer: make sure direct path is tested.Clément Bœsch2013-05-16
| |
* | Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68': vf_fade: use the name 's' for the pointer to the private context vf_drawtext: use the name 's' for the pointer to the private context vf_drawbox: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_fade: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_drawtext: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_drawbox: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
* | Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd': vf_delogo: use the name 's' for the pointer to the private context vf_cropdetect: use the name 's' for the pointer to the private context vf_crop: cosmetics, break lines Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_delogo: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_cropdetect: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_crop: cosmetics, break linesAnton Khirnov2013-05-16
| |
* | Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f83959598b6565baa0091e5739dd9091ab7a990': vf_crop: use the name 's' for the pointer to the private context vf_boxblur: use the name 's' for the pointer to the private context vf_blackframe: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_crop: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_boxblur: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * vf_blackframe: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
* | Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_aspect: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-16
| |
* | Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec': jpegls: K&R formatting cosmetics Conflicts: libavcodec/jpegls.c libavcodec/jpegls.h libavcodec/jpeglsdec.c libavcodec/jpeglsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpegls: K&R formatting cosmeticsLuca Barbato2013-05-16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>