| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f' | Michael Niedermayer | 2013-02-26 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
| | * | Remove unnecessary dsputil.h #includes | Diego Biurrun | 2013-02-26 | 1 | -1/+0 |
| | | | |||||
| * | | Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702' | Michael Niedermayer | 2012-10-10 | 1 | -4/+4 |
| |/ | | | | | | | | | | | | | | | | * commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702': swscale: Do not make ff_ symbols globally visible. rtspdec: use av_strlcpy for writing into fixed size buffer g722enc: fix size argument in memset http: use av_strlcpy instead of strcpy() without size checks avfilter: correct memcpy size avfilter_copy_buf_props() lavc: split asv12 encoder/decoder Conflicts: libavcodec/asvdec.c libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
| * | lavc: split asv12 encoder/decoder | Anton Khirnov | 2012-10-09 | 1 | -0/+95 |
 |
index : delta/ffmpeg.git | |
| git.ffmpeg.org: ffmpeg.git |
| summaryrefslogtreecommitdiff |