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>
pull/51/head
Michael Niedermayer 11 years ago
commit 196f7da7c8
  1. 1
      libavutil/avutil.h

@ -279,7 +279,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
#include "version.h" #include "version.h"
#include "mathematics.h" #include "mathematics.h"
#include "rational.h" #include "rational.h"
#include "intfloat_readwrite.h"
#include "log.h" #include "log.h"
#include "pixfmt.h" #include "pixfmt.h"

Loading…
Cancel
Save