diff options
| author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-09-21 19:27:18 +0000 |
|---|---|---|
| committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2004-09-21 19:27:18 +0000 |
| commit | 0db8f8cfa85048b7970df258ebe037babab65889 (patch) | |
| tree | 19e813341a8e64cf6eefd6557a9d8eb8c22ac95e /src/libffmpeg | |
| parent | 08a9349836192b8f5ba9519ba6e8a5342ca6b084 (diff) | |
| download | xine-lib-0db8f8cfa85048b7970df258ebe037babab65889.tar.gz xine-lib-0db8f8cfa85048b7970df258ebe037babab65889.tar.bz2 | |
Use ffmpeg buffer padding size.
CVS patchset: 6987
CVS date: 2004/09/21 19:27:18
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/mpeg_parser.c | 3 | ||||
| -rw-r--r-- | src/libffmpeg/mpeg_parser.h | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/libffmpeg/mpeg_parser.c b/src/libffmpeg/mpeg_parser.c index ddccafebf..e8183dacb 100644 --- a/src/libffmpeg/mpeg_parser.c +++ b/src/libffmpeg/mpeg_parser.c @@ -20,7 +20,7 @@ * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. * - * $Id: mpeg_parser.c,v 1.2 2004/07/18 17:36:25 tmattern Exp $ + * $Id: mpeg_parser.c,v 1.3 2004/09/21 19:27:18 tmattern Exp $ */ #define LOG_MODULE "mpeg_parser" #define LOG_VERBOSE @@ -28,7 +28,6 @@ #define LOG */ #include "mpeg_parser.h" -#include "xine_internal.h" /* mpeg frame rate table from lavc */ static const int frame_rate_tab[][2] = { diff --git a/src/libffmpeg/mpeg_parser.h b/src/libffmpeg/mpeg_parser.h index 24bbfcbbb..9cc12f380 100644 --- a/src/libffmpeg/mpeg_parser.h +++ b/src/libffmpeg/mpeg_parser.h @@ -20,9 +20,13 @@ * Simple MPEG-ES parser/framer by Thibaut Mattern (tmattern@noos.fr) * based on libmpeg2 decoder. * - * $Id: mpeg_parser.h,v 1.1 2004/07/18 00:50:02 tmattern Exp $ + * $Id: mpeg_parser.h,v 1.2 2004/09/21 19:27:18 tmattern Exp $ */ - #include <inttypes.h> +#ifndef HAVE_MPEG_PARSER_H +#define HAVE_MPEG_PARSER_H + +#include "xine_internal.h" +#include "xine_decoder.h" #define BUFFER_SIZE (1194 * 1024) /* libmpeg2's buffer size */ @@ -35,7 +39,7 @@ typedef struct mpeg_parser_s { uint32_t shift; int is_sequence_needed; - uint8_t chunk_buffer[BUFFER_SIZE]; + uint8_t chunk_buffer[BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; uint8_t *chunk_ptr; uint8_t *chunk_start; int buffer_size; @@ -69,3 +73,5 @@ uint8_t *mpeg_parser_decode_data (mpeg_parser_t *parser, /* reset the parser */ void mpeg_parser_reset (mpeg_parser_t *parser); + +#endif /* HAVE_MPEG_PARSER_H */ |