starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 23:21:06 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

Merge commit 'a8b19271c3'

Browse source 
* commit 'a8b19271c3':
  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
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()