virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'

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

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-03 13:09:23 +02:00
commit 2e0cc34292
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/matroskaenc.c
View File

@ -19,23 +19,25 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "avc.h"
#include "avformat.h" #include "avformat.h"
#include "avlanguage.h"
#include "flacenc.h"
#include "internal.h" #include "internal.h"
#include "riff.h"
#include "isom.h" #include "isom.h"
#include "matroska.h" #include "matroska.h"
#include "avc.h" #include "riff.h"
#include "flacenc.h"
#include "avlanguage.h" #include "libavutil/avstring.h"
#include "libavutil/samplefmt.h" #include "libavutil/dict.h"
#include "libavutil/sha.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/lfg.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "libavutil/lfg.h" #include "libavutil/samplefmt.h"
#include "libavutil/dict.h" #include "libavutil/sha.h"
#include "libavutil/avstring.h"
#include "libavcodec/xiph.h" #include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h" #include "libavcodec/mpeg4audio.h"