diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:17:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:18:04 +0100 |
| commit | a062bee1c12721ab460e2adee5b50dc2bd25efef (patch) | |
| tree | 0de83ff7a5837682b08022e710c03827272c66d0 /libavcodec/h264_sei.c | |
| parent | 1d91af5abae8966537f68817b3788909185dfda4 (diff) | |
| parent | 066ad249843bde656265b59110c2521e2b1ce131 (diff) | |
| download | ffmpeg-a062bee1c12721ab460e2adee5b50dc2bd25efef.tar.gz | |
Merge commit '066ad249843bde656265b59110c2521e2b1ce131'
* commit '066ad249843bde656265b59110c2521e2b1ce131':
h264_sei: reorder headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 3acd0ccd28..4e2f981181 100644 --- 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 |