* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at> |
14 years ago | |
|---|---|---|
| .. | ||
| bswap.h | Merge remote branch 'qatar/master' | 14 years ago |
| cpu.c | Merge remote-tracking branch 'newdev/master' | 14 years ago |
| intmath.h | Replace many includes of libavutil/common.h with what is actually needed | 15 years ago |
| intreadwrite.h | Replace many includes of libavutil/common.h with what is actually needed | 15 years ago |
| timer.h | Split libavutil/timer.h per architecture | 16 years ago |
| x86inc.asm | Move x86inc.asm to libavutil/. | 14 years ago |
| x86util.asm | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' | 14 years ago |