Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

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

diff --cc libavcodec/x86/dsputilenc.asm
Simple merge

diff --cc libavformat/aiff.h
Simple merge

diff --cc libavformat/au.c
Simple merge

diff --cc libavformat/cafdec.c
Simple merge

diff --cc libavformat/gxfenc.c
Simple merge

diff --cc libavformat/internal.h
index 4a9ed53def49597d4c4a6deb5b58b6932959b5f3,aafbed94a07ade60bc53d3c9ca5f6e02895a21d5..4f740c99d1a57604340d9c18ce0a563fadf3ab88
--- 1/libavformat/internal.h
--- 2/libavformat/internal.h
+++ b/libavformat/internal.h
@@@ -355,13 -354,8 +355,17 @@@ void ff_compute_frame_duration(int *pnu
  
  int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux);
  
+ unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
+ 
+ enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
+ 
 +/**
 + * Chooses a timebase for muxing the specified stream.
 + *
 + * The choosen timebase allows sample accurate timestamps based
 + * on the framerate or sample rate for audio streams. It also is
 + * at least as precisse as 1/min_precission would be.
 + */
 +AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precission);
 +
  #endif /* AVFORMAT_INTERNAL_H */

diff --cc libavformat/isom.c
Simple merge

diff --cc libavformat/lxfdec.c
index 3137cda851a2debe245c9218095eac77826a6280,a10dcca08f00670817ce02ad75322074c5dcd9b3..90c49749a659ac23d7a6cd7209213beca706d2a2
--- 1/libavformat/lxfdec.c
--- 2/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@@ -20,12 -20,10 +20,11 @@@
   */
  
  #include "libavutil/intreadwrite.h"
 +#include "libavcodec/bytestream.h"
  #include "avformat.h"
  #include "internal.h"
- #include "riff.h"
  
 -#define LXF_PACKET_HEADER_SIZE  60
 +#define LXF_MAX_PACKET_HEADER_SIZE 256
  #define LXF_HEADER_DATA_SIZE    120
  #define LXF_IDENT               "LEITCH\0"
  #define LXF_IDENT_LENGTH        8

diff --cc libavformat/nsvdec.c
index 3015d844919bacf3721c3b5853744f7aa758520a,d7c3c81f363b042829aceddb9acb75d73a424143..b6984a68a23f7b9230ed8065cb409ed55dc37360
--- 1/libavformat/nsvdec.c
--- 2/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@@ -23,9 -23,7 +23,8 @@@
  #include "libavutil/mathematics.h"
  #include "avformat.h"
  #include "internal.h"
- #include "riff.h"
  #include "libavutil/dict.h"
 +#include "libavutil/intreadwrite.h"
  
  //#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!!
  #define CHECK_SUBSEQUENT_NSVS

diff --cc libavformat/nut.c
index fc300fe378b7ba867b74170c3b91565671c42a3a,196e04e54fa3d757cf643acf936360b3fd39fd05..62a650dbede4b548ea736f1bc9cf24784547725b
--- 1/libavformat/nut.c
--- 2/libavformat/nut.c
+++ b/libavformat/nut.c
@@@ -146,13 -123,9 +146,14 @@@ const AVCodecTag ff_nut_video_tags[] = 
      { AV_CODEC_ID_NONE    , 0                         }
  };
  
 -const AVCodecTag ff_nut_audio_tags[] = {
 +static const AVCodecTag nut_audio_extra_tags[] = {
      { AV_CODEC_ID_PCM_ALAW,         MKTAG('A', 'L', 'A', 'W') },
      { AV_CODEC_ID_PCM_MULAW,        MKTAG('U', 'L', 'A', 'W') },
++    { AV_CODEC_ID_MP3,              MKTAG('M', 'P', '3', ' ') },
 +    { AV_CODEC_ID_NONE,             0                         }
 +};
 +
 +const AVCodecTag ff_nut_audio_tags[] = {
      { AV_CODEC_ID_PCM_F32BE,        MKTAG(32 , 'D', 'F', 'P') },
      { AV_CODEC_ID_PCM_F32LE,        MKTAG('P', 'F', 'D', 32 ) },
      { AV_CODEC_ID_PCM_F64BE,        MKTAG(64 , 'D', 'F', 'P') },

diff --cc libavformat/nut.h
Simple merge

diff --cc libavformat/nutdec.c
index 9954583fc2dd1234eae338859306e099a9d4556b,b7059877956cd8e2c75eee4653d636232a21683f..ac3ef7d9091961edc68f179751dadd9ac9df7f54
--- 1/libavformat/nutdec.c
--- 2/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@@ -28,12 -27,13 +28,13 @@@
  #include "libavutil/tree.h"
  #include "avio_internal.h"
  #include "nut.h"
+ #include "riff.h"
  
 -#undef NDEBUG
 -#include <assert.h>
 -
  #define NUT_MAX_STREAMS 256    /* arbitrary sanity check value */
  
 +static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index,
 +                                  int64_t *pos_arg, int64_t pos_limit);
 +
  static int get_str(AVIOContext *bc, char *string, unsigned int maxlen)
  {
      unsigned int len = ffio_read_varlen(bc);

diff --cc libavformat/nutenc.c
Simple merge

diff --cc libavformat/omadec.c
Simple merge

diff --cc libavformat/riff.c
Simple merge

diff --cc libavformat/riff.h
index 6f2eeac1767720328418be154db619d06b6e5b9d,761f92ed8f48f129765118a1f8b74db03952aff9..8579a953c86063d319e8582507f3aa6066368578
--- 1/libavformat/riff.h
--- 2/libavformat/riff.h
+++ b/libavformat/riff.h
@@@ -54,38 -54,10 +54,36 @@@ int ff_get_wav_header(AVIOContext *pb, 
  extern const AVCodecTag ff_codec_bmp_tags[];
  extern const AVCodecTag ff_codec_wav_tags[];
  
- unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
- enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
  void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
  
 +typedef uint8_t ff_asf_guid[16];
 +
  int ff_read_riff_info(AVFormatContext *s, int64_t size);
  
 +#define FF_PRI_GUID \
 +    "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
 +#define FF_ARG_GUID(g) \
 +    g[0],g[1],g[2],g[3],g[4],g[5],g[6],g[7],g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15]
 +
 +static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
 +{
 +    return memcmp(g1, g2, sizeof(ff_asf_guid));
 +}
 +
 +void ff_get_guid(AVIOContext *s, ff_asf_guid *g);
 +
 +typedef struct {
 +    enum AVCodecID id;
 +    ff_asf_guid guid;
 +} AVCodecGuid;
 +
 +enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid);
 +
 +extern const AVCodecGuid ff_codec_wav_guids[];
 +
 +#define FF_MEDIASUBTYPE_BASE_GUID \
 +    0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71
 +
  /**
   * Write all recognized RIFF tags from s->metadata
   */

diff --cc libavformat/rmdec.c
Simple merge

diff --cc libavformat/rsodec.c
Simple merge

diff --cc libavformat/smjpegenc.c
Simple merge

diff --cc libavformat/swf.h
Simple merge

diff --cc libavformat/voc.h
Simple merge

diff --cc tests/fate/vpx.mak
index d3f9cc79ae798a715feafa75353db3dcfe3ef98b,a870ea5d41dee57ed202aad5fa1f7069e851a4f9..fd9c905b4e525e8ff9501c9c1d46be4c6cdfeb1c
--- 1/tests/fate/vpx.mak
--- 2/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@@ -37,13 -37,13 +37,13 @@@ define FATE_VP8_FUL
  $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
  
  # FIXME this file contains two frames with identical timestamps,
 -# so avconv drops one of them
 +# so ffmpeg drops one of them
- FATE_VP8 += fate-vp8-sign-bias$(1)
+ FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-sign-bias$(1)
  fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf
  fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
  
- FATE_VP8 += fate-vp8-size-change$(1)
+ FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-size-change$(1)
 -fate-vp8-size-change$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/frame_size_change.webm -frames:v 30
 +fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear
  fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
  endef