From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 3 May 2013 11:09:23 +0000 (+0200)
Subject: Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2e0cc34292d25526f9b91752aa980fd740a0edf7;p=ffmpeg

Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'

* commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb':
  matroskaenc: cosmetics, reorder the #includes

Conflicts:
	libavformat/matroskaenc.c

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

2e0cc34292d25526f9b91752aa980fd740a0edf7
diff --cc libavformat/matroskaenc.c
index 6726fd98124,b0998d49c0b..1f1ff49ecef
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@@ -19,23 -19,24 +19,25 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
+ #include "avc.h"
  #include "avformat.h"
+ #include "avlanguage.h"
+ #include "flacenc.h"
  #include "internal.h"
- #include "riff.h"
  #include "isom.h"
  #include "matroska.h"
- #include "avc.h"
- #include "flacenc.h"
- #include "avlanguage.h"
- #include "libavutil/samplefmt.h"
- #include "libavutil/sha.h"
- #include "libavutil/intreadwrite.h"
+ #include "riff.h"
+ 
+ #include "libavutil/avstring.h"
+ #include "libavutil/dict.h"
  #include "libavutil/intfloat.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/lfg.h"
  #include "libavutil/mathematics.h"
  #include "libavutil/random_seed.h"
- #include "libavutil/lfg.h"
- #include "libavutil/dict.h"
- #include "libavutil/avstring.h"
+ #include "libavutil/samplefmt.h"
++#include "libavutil/sha.h"
+ 
  #include "libavcodec/xiph.h"
  #include "libavcodec/mpeg4audio.h"