diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:43:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:43:11 +0200 |
| commit | a561662fb7223cb98907744e03398848a0d362e1 (patch) | |
| tree | 23720ae7eb8ba20c8bc6c2db995b977d93433115 /libavcodec/avcodec.h | |
| parent | 2bf87dcc2d3079ead09b250df6932c94ff13504c (diff) | |
| parent | ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d (diff) | |
| download | ffmpeg-a561662fb7223cb98907744e03398848a0d362e1.tar.gz | |
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
avcodec: Undeprecate reordered_opaque
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index efe94eeb6c..7d10d3d0f0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2613,7 +2613,6 @@ typedef struct AVCodecContext { /** * opaque 64bit number (generally a PTS) that will be reordered and * output in AVFrame.reordered_opaque - * @deprecated in favor of pkt_pts * - encoding: unused * - decoding: Set by user. */ |