diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:18:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:18:28 +0100 |
| commit | 41135b7f64e699a71250b0c2082ba53b0338069a (patch) | |
| tree | 722cfb318703cc777579faa3d1996f8c340d35cf /libavresample/Makefile | |
| parent | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (diff) | |
| parent | b2fe6756e34d1316d0fa799e8a5ace993059c407 (diff) | |
| download | ffmpeg-streaming-41135b7f64e699a71250b0c2082ba53b0338069a.zip ffmpeg-streaming-41135b7f64e699a71250b0c2082ba53b0338069a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add option for dithering during sample format conversion to s16
mpeg12: do not decode extradata more than once.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/Makefile')
| -rw-r--r-- | libavresample/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavresample/Makefile b/libavresample/Makefile index c0c20a9..6805280 100644 --- a/libavresample/Makefile +++ b/libavresample/Makefile @@ -8,6 +8,7 @@ OBJS = audio_convert.o \ audio_data.o \ audio_mix.o \ audio_mix_matrix.o \ + dither.o \ options.o \ resample.o \ utils.o \ |
