Merge remote branch 'qatar/master'

* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

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

diff --cc cmdutils.c
Simple merge

diff --cc configure
Simple merge

diff --cc doc/faq.texi
Simple merge

diff --cc doc/ffmpeg.texi
index 18b6d65,0d12f65..62b8996
--- 1/doc/ffmpeg.texi
--- 2/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@@ -1057,10 -1046,10 +1055,10 @@@ file to which you want to add them
  @ignore
  
  @setfilename ffmpeg
- @settitle FFmpeg video converter
+ @settitle ffmpeg video converter
  
  @c man begin SEEALSO
 -ffplay(1), ffprobe(1), ffserver(1) and the Libav HTML documentation
 +ffplay(1), ffprobe(1), ffserver(1) and the FFmpeg HTML documentation
  @c man end
  
  @c man begin AUTHORS

diff --cc doc/ffplay.texi
Simple merge

diff --cc doc/ffprobe.texi
index de65eee,5e856e6..15e7764
--- 1/doc/ffprobe.texi
--- 2/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@@ -119,10 -119,10 +119,10 @@@ with name "STREAM"
  @ignore
  
  @setfilename ffprobe
- @settitle FFprobe media prober
+ @settitle ffprobe media prober
  
  @c man begin SEEALSO
 -ffmpeg(1), ffplay(1), ffserver(1) and the Libav HTML documentation
 +ffmpeg(1), ffplay(1), ffserver(1) and the FFmpeg HTML documentation
  @c man end
  
  @c man begin AUTHORS

diff --cc doc/ffserver.texi
Simple merge

diff --cc doc/general.texi
index 2793786,e68e83e..05ce0a0
--- 1/doc/general.texi
--- 2/doc/general.texi
+++ b/doc/general.texi
@@@ -786,12 -781,12 +786,12 @@@ to configure
  
  @subsection BSD
  
 -BSD make will not build Libav, you need to install and use GNU Make
 +BSD make will not build FFmpeg, you need to install and use GNU Make
  (@file{gmake}).
  
- @subsubsection FreeBSD
+ @subsubsection FreeBSD, DragonFly BSD
  
- FreeBSD will not compile out-of-the-box due to broken system headers.
+ These systems will not compile out-of-the-box due to broken system headers.
  Passing @code{--extra-cflags=-D__BSD_VISIBLE} to configure will work
  around the problem. This may have unexpected sideeffects, so use it at
  your own risk. If you care about FreeBSD, please make an attempt at

diff --cc ffmpeg.c
index 8749907,d54785d..2c69608
--- 1/ffmpeg.c
--- 2/ffmpeg.c
+++ b/ffmpeg.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
-  * FFmpeg main
+  * ffmpeg main
   * Copyright (c) 2000-2003 Fabrice Bellard
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc ffplay.c
index eb08f36,18010ef..680215a
--- 1/ffplay.c
--- 2/ffplay.c
+++ b/ffplay.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
-  * FFplay : Simple Media Player based on the FFmpeg libraries
 - * ffplay : Simple Media Player based on the Libav libraries
++ * ffplay : Simple Media Player based on the FFmpeg libraries
   * Copyright (c) 2003 Fabrice Bellard
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc ffprobe.c
index 228aaab,6e26c11..696307d
--- 1/ffprobe.c
--- 2/ffprobe.c
+++ b/ffprobe.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
-  * FFprobe : Simple Media Prober based on the FFmpeg libraries
 - * ffprobe : Simple Media Prober based on the Libav libraries
++ * ffprobe : Simple Media Prober based on the FFmpeg libraries
   * Copyright (c) 2007-2010 Stefano Sabatini
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc ffserver.c
Simple merge

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/aacdec.c
Simple merge

diff --cc libavcodec/aacenc.c
Simple merge

diff --cc libavcodec/aacpsy.c
Simple merge

diff --cc libavcodec/cook.c
Simple merge

diff --cc libavcodec/twinvq.c
Simple merge

diff --cc libavcodec/vorbisdec.c
Simple merge

diff --cc libavcodec/vorbisenc.c
Simple merge

diff --cc libavformat/Makefile
Simple merge

diff --cc libavformat/allformats.c
Simple merge

diff --cc libavformat/applehttp.c
Simple merge

diff --cc libavformat/mov.c
index ee033ea,65fcf19..a44182a
--- 1/libavformat/mov.c
--- 2/libavformat/mov.c
+++ b/libavformat/mov.c
@@@ -2414,9 -2414,9 +2414,9 @@@ static int mov_read_packet(AVFormatCont
          mov->found_mdat = 0;
          if (s->pb->seekable||
              mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 ||
 -            s->pb->eof_reached)
 +            url_feof(s->pb))
              return AVERROR_EOF;
-         av_dlog(s, "read fragments, offset 0x%llx\n", avio_tell(s->pb));
+         av_dlog(s, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb));
          goto retry;
      }
      sc = st->priv_data;

diff --cc libavformat/os_support.c
Simple merge

diff --cc libavformat/os_support.h
Simple merge

diff --cc libavformat/rdt.c
Simple merge

diff --cc libavformat/rtpdec.h
Simple merge

diff --cc libavformat/rtpdec_amr.c
Simple merge

diff --cc libavformat/rtpdec_asf.c
Simple merge

diff --cc libavformat/rtpdec_h264.c
Simple merge

diff --cc libavformat/rtpdec_latm.c
Simple merge

diff --cc libavformat/rtpdec_mpeg4.c
Simple merge

diff --cc libavformat/rtpdec_qcelp.c
Simple merge

diff --cc libavformat/rtpdec_qdm2.c
Simple merge

diff --cc libavformat/rtpdec_qt.c
Simple merge

diff --cc libavformat/rtpdec_svq3.c
Simple merge

diff --cc libavformat/rtpdec_vp8.c
Simple merge

diff --cc libavformat/rtpdec_xiph.c
Simple merge

diff --cc libavformat/rtsp.c
Simple merge

diff --cc libavformat/version.h
Simple merge

diff --cc libavutil/x86/bswap.h
Simple merge

diff --cc tools/patcheck
Simple merge