RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-15 11:51:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

Browse Source 
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
  avcodec: Undeprecate reordered_opaque

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 20:43:11 +02:00
commit a561662fb7
3 changed files with 4 additions and 2 deletions
Show Stats 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: API changes, most recent first:
2014-08-xx - xxxxxxx - lavc 55.57.3 - avcodec.h
reordered_opaque is not going to be removed in the future.
2014-08-02 - xxxxxxx - lavu 52.98.100 - pixelutils.h 2014-08-02 - xxxxxxx - lavu 52.98.100 - pixelutils.h
Add pixelutils API with SAD functions Add pixelutils API with SAD functions

1
libavcodec/avcodec.h
View File

@ -2613,7 +2613,6 @@ typedef struct AVCodecContext {
/** /**
* opaque 64bit number (generally a PTS) that will be reordered and * opaque 64bit number (generally a PTS) that will be reordered and
* output in AVFrame.reordered_opaque * output in AVFrame.reordered_opaque
* @deprecated in favor of pkt_pts
* - encoding: unused * - encoding: unused
* - decoding: Set by user. * - decoding: Set by user.
*/ */

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 73 #define LIBAVCODEC_VERSION_MINOR 73
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \