diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 11:33:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 12:59:08 +0100 |
| commit | 78265fcfeee153e5e26ad4dbc7831a84ade447d6 (patch) | |
| tree | 92bc81fca00966f3c867baa7dd339eb5c62730c4 /libavutil | |
| parent | 2acc525d786f0ee4b0a354858a5f146ce6580658 (diff) | |
| parent | 28096e0a806e57376541e6222d315619906e3c55 (diff) | |
Merge commit '28096e0a806e57376541e6222d315619906e3c55'
* commit '28096e0a806e57376541e6222d315619906e3c55':
h264: wait for initial complete frame before outputing frames
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/mpegvideo.h
libavutil/frame.h
libavutil/version.h
See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 10 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 3be6892020..664d3eddad 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -386,6 +386,16 @@ typedef struct AVFrame { AVFrameSideData **side_data; int nb_side_data; +/** + * The frame data may be corrupted, e.g. due to decoding errors. + */ +#define AV_FRAME_FLAG_CORRUPT (1 << 0) + + /** + * Frame flags, a combination of AV_FRAME_FLAG_* + */ + int flags; + /** * frame timestamp estimated using various heuristics, in stream time base * Code outside libavcodec should access this field using: diff --git a/libavutil/version.h b/libavutil/version.h index 67a2acd107..c3de379b57 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 48 +#define LIBAVUTIL_VERSION_MINOR 49 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |