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

Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

Browse Source 
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-01 16:41:41 +02:00
parent b7dd250b75 5fccedaa67
commit cac07d0e10
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/version.h
View File

@@ -147,5 +147,8 @@
#ifndef FF_API_ARCH_SPARC
#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
#endif /* AVCODEC_VERSION_H */