Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'

* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 15 insertions, 0 deletions

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 4f740c99d1..14f4cdbdf1 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -360,6 +360,21 @@ unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
 enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
 
 /**
+ * Select a PCM codec based on the given parameters.
+ *
+ * @param bps     bits-per-sample
+ * @param flt     floating-point
+ * @param be      big-endian
+ * @param sflags  signed flags. each bit corresponds to one byte of bit depth.
+ *                e.g. the 1st bit indicates if 8-bit should be signed or
+ *                unsigned, the 2nd bit indicates if 16-bit should be signed or
+ *                unsigned, etc... This is useful for formats such as WAVE where
+ *                only 8-bit is unsigned and all other bit depths are signed.
+ * @return        a PCM codec id or AV_CODEC_ID_NONE
+ */
+enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags);
+
+/**
  * Chooses a timebase for muxing the specified stream.
  *
  * The choosen timebase allows sample accurate timestamps based