RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-05 06:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'

Browse Source 
* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

Conflicts:
	libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-10 02:01:34 +02:00
commit 329832d779
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avformat.h
View File

@ -934,11 +934,6 @@ typedef struct AVStream {
int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
#if FF_API_REFERENCE_DTS
/* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
* though it should not */
int64_t do_not_use;
#endif
// Timestamp generation support: // Timestamp generation support:
/** /**
* Timestamp corresponding to the last dts sync point. * Timestamp corresponding to the last dts sync point.

3
libavformat/version.h
View File

@ -48,9 +48,6 @@
* dropped at a future version bump. The defines themselves are not part of * dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time. * the public API and may change, break or disappear at any time.
*/ */
#ifndef FF_API_REFERENCE_DTS
#define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_LAVF_BITEXACT #ifndef FF_API_LAVF_BITEXACT
#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57) #define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 57)
#endif #endif