diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 00:14:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 00:26:01 +0100 |
| commit | 196f7da7c81814de7883c8b33c7d3866f7cac687 (patch) | |
| tree | 796cee395a8728198910f817dc604812c4c6cdcf | |
| parent | a67387913eb0c19f2dac4f1e085e5429d2074d6f (diff) | |
| parent | 0d882e9e7b78f3874ef9511d739da9d64f1ec58a (diff) | |
| download | ffmpeg-196f7da7c81814de7883c8b33c7d3866f7cac687.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Remove deprecated intfloat_readwrite code
Conflicts:
libavutil/intfloat_readwrite.c
libavutil/intfloat_readwrite.h
The files are left in place as they are still used by some projects
mplayer is one.
Theres no hurry in removing the code, it can as well be removed once
no projects use it anymore
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/avutil.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 5ebda5ed6f..d8f469064a 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -279,7 +279,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type); #include "version.h" #include "mathematics.h" #include "rational.h" -#include "intfloat_readwrite.h" #include "log.h" #include "pixfmt.h" |