Merge remote-tracking branch 'newdev/master'

* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/ac3dec.c
	libavformat/avio.h
	libavformat/id3v2.c

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

diff --cc configure
index 7793109,19b9f98..9809ab0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2801,10 -2783,8 +2801,9 @@@ check_func_headers windows.h GetProcess
  check_func_headers windows.h MapViewOfFile
  check_func_headers windows.h VirtualAlloc
  
- check_header conio.h
  check_header dlfcn.h
  check_header dxva2api.h
 +check_header libcrystalhd/libcrystalhd_if.h
  check_header malloc.h
  check_header poll.h
  check_header sys/mman.h

diff --cc ffmpeg.c
index f9e97a2,6922e62..f3680df
--- 1/ffmpeg.c
--- 2/ffmpeg.c
+++ b/ffmpeg.c
@@@ -2509,9 -2436,12 +2457,13 @@@ static int transcode(AVFormatContext **
          print_sdp(output_files, nb_output_files);
      }
  
 -    if (!using_stdin && verbose >= 0) {
 +    if (!using_stdin) {
 +        if(verbose >= 0)
+ #if HAVE_KBHIT
 -        fprintf(stderr, "Press [q] to stop encoding\n");
 +            fprintf(stderr, "Press [q] to stop encoding\n");
+ #else
 -        fprintf(stderr, "Press ctrl-c to stop encoding\n");
++            fprintf(stderr, "Press ctrl-c to stop encoding\n");
+ #endif
          url_set_interrupt_cb(decode_interrupt_cb);
      }
      term_init();

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/ac3dec.c
Simple merge

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/dct.h
Simple merge

diff --cc libavcodec/fft.h
Simple merge

diff --cc libavcodec/ffv1.c
Simple merge

diff --cc libavcodec/roqvideoenc.c
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/vc1.h
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavformat/amr.c
index 0459632,260bd6a..66763f3
--- 1/libavformat/amr.c
--- 2/libavformat/amr.c
+++ b/libavformat/amr.c
@@@ -121,8 -121,9 +121,9 @@@ static int amr_read_packet(AVFormatCont
  {
      AVCodecContext *enc = s->streams[0]->codec;
      int read, size = 0, toc, mode;
+     int64_t pos = avio_tell(s->pb);
  
 -    if (s->pb->eof_reached)
 +    if (url_feof(s->pb))
      {
          return AVERROR(EIO);
      }

diff --cc libavformat/applehttp.c
Simple merge

diff --cc libavformat/asfdec.c
Simple merge

diff --cc libavformat/avio.h
index 2d2afc7,753fa0c..55eefb5
--- 1/libavformat/avio.h
--- 2/libavformat/avio.h
+++ b/libavformat/avio.h
@@@ -506,16 -516,6 +509,12 @@@ static av_always_inline int64_t avio_te
   */
  int64_t avio_size(AVIOContext *s);
  
- int av_url_read_fpause(AVIOContext *h, int pause);
- int64_t av_url_read_fseek(AVIOContext *h, int stream_index,
-                           int64_t timestamp, int flags);
- 
 +/**
 + * feof() equivalent for AVIOContext.
 + * @return non zero if and only if end of file
 + */
 +int url_feof(AVIOContext *s);
 +
  /** @warning currently size is limited */
  #ifdef __GNUC__
  int avio_printf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));

diff --cc libavformat/avio_internal.h
Simple merge

diff --cc libavformat/aviobuf.c
Simple merge

diff --cc libavformat/flvdec.c
Simple merge

diff --cc libavformat/id3v2.c
index 027b8d7,4fecffe..9535327
--- 1/libavformat/id3v2.c
--- 2/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@@ -184,12 -184,11 +184,12 @@@ finish
  
  static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
  {
 -    int isv34, tlen, unsync;
 +    int isv34, unsync;
 +    unsigned tlen;
      char tag[5];
-     int64_t next;
+     int64_t next, end = avio_tell(s->pb) + len;
      int taghdrlen;
-     const char *reason;
+     const char *reason = NULL;
      AVIOContext pb;
      unsigned char *buffer = NULL;
      int buffer_size = 0;

diff --cc libavformat/mp3dec.c
Simple merge

diff --cc libavformat/rmenc.c
Simple merge

diff --cc libavformat/rtsp.c
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libavformat/wtv.c
Simple merge

diff --cc libavutil/cpu.c
Simple merge

diff --cc libavutil/cpu.h
Simple merge

diff --cc libavutil/x86/cpu.c
Simple merge