diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-09-05 19:23:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-09-05 19:23:32 +0000 |
| commit | 2c00106c2b07d38ec90cc9906aef2437df6f1ad7 (patch) | |
| tree | bdbc23d9cb776b0d73d4578fb309daee9269f2c3 /libavformat | |
| parent | 577cd173e3881cbb5f7e5386c04d5384a7bf9408 (diff) | |
ignore index parameter to ignore the ODML index in avi
Originally committed as revision 6177 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 1 | ||||
| -rw-r--r-- | libavformat/avidec.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ad16898cf4..ff6166ab04 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -342,6 +342,7 @@ typedef struct AVFormatContext { int flags; #define AVFMT_FLAG_GENPTS 0x0001 ///< generate pts if missing even if it requires parsing future frames +#define AVFMT_FLAG_IGNIDX 0x0002 ///< ignore index int loop_input; /* decoding: size of data to probe; encoding unused */ diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 8744be685a..0e03365ede 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -456,7 +456,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) break; case MKTAG('i', 'n', 'd', 'x'): i= url_ftell(pb); - if(!url_is_streamed(pb)){ + if(!url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX)){ read_braindead_odml_indx(s, 0); } url_fseek(pb, i+size, SEEK_SET); diff --git a/libavformat/utils.c b/libavformat/utils.c index dfb7cb88a6..ea447c1fa7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -466,6 +466,9 @@ static const char* format_to_name(void* ptr) static const AVOption options[]={ {"probesize", NULL, OFFSET(probesize), FF_OPT_TYPE_INT, DEFAULT, 32, INT_MAX, D}, +{"fflags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, DEFAULT, INT_MIN, INT_MAX, D, "fflags"}, +{"ignidx", "ignore index", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_IGNIDX, INT_MIN, INT_MAX, D, "fflags"}, +{"genpts", "generate pts", 0, FF_OPT_TYPE_CONST, AVFMT_FLAG_GENPTS, INT_MIN, INT_MAX, D, "fflags"}, {NULL}, }; |