diff options
| -rw-r--r-- | tools/h264.h | 12 | ||||
| -rw-r--r-- | tools/mpeg.h | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/tools/h264.h b/tools/h264.h index 2e14136b..34e11b81 100644 --- a/tools/h264.h +++ b/tools/h264.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: h264.h,v 1.1 2008-02-04 22:43:27 phintuka Exp $ + * $Id: h264.h,v 1.2 2008-03-16 22:12:56 phintuka Exp $ * */ @@ -16,18 +16,12 @@ extern "C" { #endif - -#ifndef VIDEO_SIZE_T -#define VIDEO_SIZE_T -typedef struct { - int width; - int height; -} video_size_t; -#endif +#include "mpeg.h" typedef struct { int width; int height; + double pixel_aspect; /* ... */ } h264_sps_data_t; diff --git a/tools/mpeg.h b/tools/mpeg.h index c752c184..c17ee0ec 100644 --- a/tools/mpeg.h +++ b/tools/mpeg.h @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: mpeg.h,v 1.1 2008-02-04 22:42:13 phintuka Exp $ + * $Id: mpeg.h,v 1.2 2008-03-16 22:12:56 phintuka Exp $ * */ @@ -27,13 +27,12 @@ extern "C" { #define B_FRAME 3 -#ifndef VIDEO_SIZE_T -#define VIDEO_SIZE_T typedef struct { int width; int height; + double pixel_aspect; } video_size_t; -#endif + extern const char * const picture_type_str[]; |