diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-07 22:42:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-07 22:51:34 +0200 |
| commit | 653d117c29123d353ce3bdd7de71e830a26733c1 (patch) | |
| tree | 996ad2bd13c774dc3265cbf0d8ae406372d57307 /libavresample | |
| parent | cb982739fa2b43afb7f1262c07804cad41f778de (diff) | |
| parent | fdc918632f5c16cf377a2170cd2f101933fb15ff (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libschroedinger: Switch to function names more in line with Libav style.
Move code shared between libdirac and libschroedinger to libschroedinger.
lavfi: uninline avfilter_copy_buffer_ref_props().
lavf: add missing '*' in a doxy.
h264: Remove a commented-out function pointer typedef.
txd: Remove write-only variable in txd_decode_frame().
mmvideo.c: Remove unused variable in mm_decode_pal().
build: cosmetics: Add missing end-of-line backslashes to item lists.
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
libschroedinger: Move a function to avoid a forward declaration.
pthread: warn on high thread counts
vf_yadif: fix missing error handling for avfilter_poll_frame()
avprobe: allow showing only one container/stream property.
lavfi: support audio in avfilter_copy_frame_props().
lavfi: avfilter_merge_formats: handle case where inputs are same
lavc: add sample rate and channel layout to AVFrame.
zerocodec: check if the previous frame is missing
doc: clarify check for NULL pointer style
Conflicts:
doc/APIchanges
doc/developer.texi
ffprobe.c
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/libdirac_libschro.c
libavcodec/libdirac_libschro.h
libavcodec/mmvideo.c
libavcodec/txd.c
libavcodec/version.h
libavcodec/zerocodec.c
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/version.h
libavformat/Makefile
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/Makefile | 4 | ||||
| -rw-r--r-- | libavresample/x86/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavresample/Makefile b/libavresample/Makefile index ce3fe81953..c0c20a900a 100644 --- a/libavresample/Makefile +++ b/libavresample/Makefile @@ -2,7 +2,7 @@ NAME = avresample FFLIBS = avutil HEADERS = avresample.h \ - version.h + version.h \ OBJS = audio_convert.o \ audio_data.o \ @@ -10,6 +10,6 @@ OBJS = audio_convert.o \ audio_mix_matrix.o \ options.o \ resample.o \ - utils.o + utils.o \ TESTPROGS = avresample diff --git a/libavresample/x86/Makefile b/libavresample/x86/Makefile index 63697faee7..65bed899ba 100644 --- a/libavresample/x86/Makefile +++ b/libavresample/x86/Makefile @@ -1,5 +1,5 @@ OBJS += x86/audio_convert_init.o \ - x86/audio_mix_init.o + x86/audio_mix_init.o \ YASM-OBJS += x86/audio_convert.o \ - x86/audio_mix.o + x86/audio_mix.o \ |