generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

Browse Source 
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-03 10:48:11 +02:00
parent 1607a98545 a8b19271c3
commit 82fdfe8e51
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@@ -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()