diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:48:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:48:11 +0200 |
commit | 82fdfe8e51c593b484fd590368f2d70ef39f2bf8 (patch) | |
tree | ff95c2e7a87ca4929a8471e30765b8c7724faea6 /doc/APIchanges | |
parent | 1607a985455287ccae3bfa46393a6cdfc04ce64f (diff) | |
parent | a8b19271c3b40ac3c3dc769fe248887acf14ba5a (diff) | |
download | ffmpeg-82fdfe8e51c593b484fd590368f2d70ef39f2bf8.tar.gz |
Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
avcodec: Add output_picture_number to AVCodecParserContext
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 2bb45fad10..8df27a87cd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-08-xx - xxxxxxx - lavc 55.11.0 - avcodec.h + Add output_picture_number to AVCodecParserContext. + 2013-07-XX - xxxxxxx - XXXXXXXXXXXXXX - avcodec.h Add avcodec_chroma_pos_to_enum() Add avcodec_enum_to_chroma_pos() |