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>

diff --cc libavutil/avutil.h
index 5ebda5e,782284d..d8f4690
--- 1/libavutil/avutil.h
--- 2/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@@ -274,50 -303,8 +274,49 @@@ char av_get_picture_type_char(enum AVPi
   * @}
   */
  
 +#include "common.h"
  #include "error.h"
  #include "version.h"
- #include "intfloat_readwrite.h"
 +#include "mathematics.h"
 +#include "rational.h"
 +#include "log.h"
 +#include "pixfmt.h"
 +
 +/**
 + * Return x default pointer in case p is NULL.
 + */
 +static inline void *av_x_if_null(const void *p, const void *x)
 +{
 +    return (void *)(intptr_t)(p ? p : x);
 +}
 +
 +/**
 + * Compute the length of an integer list.
 + *
 + * @param elsize  size in bytes of each list element (only 1, 2, 4 or 8)
 + * @param term    list terminator (usually 0 or -1)
 + * @param list    pointer to the list
 + * @return  length of the list, in elements, not counting the terminator
 + */
 +unsigned av_int_list_length_for_size(unsigned elsize,
 +                                     const void *list, uint64_t term) av_pure;
 +
 +/**
 + * Compute the length of an integer list.
 + *
 + * @param term  list terminator (usually 0 or -1)
 + * @param list  pointer to the list
 + * @return  length of the list, in elements, not counting the terminator
 + */
 +#define av_int_list_length(list, term) \
 +    av_int_list_length_for_size(sizeof(*(list)), list, term)
 +
 +/**
 + * Open a file using a UTF-8 filename.
 + * The API of this function matches POSIX fopen(), errors are returned through
 + * errno.
 + */
 +FILE *av_fopen_utf8(const char *path, const char *mode);
  
  /**
   * @}