diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:09:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 13:09:23 +0200 |
| commit | 2e0cc34292d25526f9b91752aa980fd740a0edf7 (patch) | |
| tree | 3e6acbef6a0c59e74e80186711d185713723ceb8 /libavformat/matroskaenc.c | |
| parent | 9fd5e75bdf62c5aa19163a6033b361dcc8e31238 (diff) | |
| parent | 0574bc06d23a6690a16c5926dddc9be359a3d7bb (diff) | |
| download | ffmpeg-2e0cc34292d25526f9b91752aa980fd740a0edf7.tar.gz | |
Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'
* commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb':
matroskaenc: cosmetics, reorder the #includes
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6726fd9812..1f1ff49ece 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -19,23 +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" |