Merge commit '066ad249843bde656265b59110c2521e2b1ce131'

* commit '066ad249843bde656265b59110c2521e2b1ce131': h264_sei: reorder headers Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · a062bee1c1
parent 1d91af5aba 066ad24984
commit a062bee1c1
1 changed files with 2 additions and 4 deletions
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@ -25,12 +25,10 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */

-#include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
 #include "golomb.h"
-
-#include <assert.h>
+#include "h264.h"
+#include "internal.h"

 static const uint8_t sei_num_clock_ts_table[9] = {
    1, 1, 1, 2, 2, 3, 3, 2, 3