diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 12:15:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 12:15:01 +0200 |
| commit | 6fc58a8cb6707087e31fa8396a9e73c6f7595638 (patch) | |
| tree | 903d7eebf1d0bc708be1ad3139bce3f045b254f1 | |
| parent | e91339cde25afff244b1f5cb2fc206f3dc9570d8 (diff) | |
| parent | 507b1e454cf9953da3e18f33c9bd1fca78c97cb5 (diff) | |
| download | ffmpeg-6fc58a8cb6707087e31fa8396a9e73c6f7595638.tar.gz | |
Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'
* commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 763ccf05ab..b023a6fc57 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -167,6 +167,9 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2013-04-xx - xxxxxxx - lavc 55.4.0 - avcodec.h + Add field_order to AVCodecParserContext. + 2013-03-xx - xxxxxxx - lavc 55.2.0 - avcodec.h Add CODEC_FLAG_UNALIGNED to allow decoders to produce unaligned output. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4ac66551c6..1978054230 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3908,6 +3908,8 @@ typedef struct AVCodecParserContext { * For all other types, this is in units of AVCodecContext.time_base. */ int duration; + + enum AVFieldOrder field_order; } AVCodecParserContext; typedef struct AVCodecParser { diff --git a/libavcodec/version.h b/libavcodec/version.h index c305747ffd..859ed97abd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 6 +#define LIBAVCODEC_VERSION_MINOR 7 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |