diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 12:28:04 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 12:28:04 +0000 |
| commit | 9938697c1c119a675759029ead74b91c529cdf2e (patch) | |
| tree | df594b8ceda53d29763040312c6ea48c692e2781 /libavcodec/avcodec.h | |
| parent | b4af7d68fe14c6978a1a2f8b1bb34fd50d189160 (diff) | |
| parent | d749615333084e62c9fcc480d1ae466369fdf14f (diff) | |
| download | ffmpeg-9938697c1c119a675759029ead74b91c529cdf2e.tar.gz | |
Merge commit 'd749615333084e62c9fcc480d1ae466369fdf14f'
* commit 'd749615333084e62c9fcc480d1ae466369fdf14f':
lavc: Move timecode_frame_start to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 727b3a1c03..0a478e6b1c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2633,12 +2633,11 @@ typedef struct AVCodecContext { */ int max_prediction_order; - /** - * GOP timecode frame start number - * - encoding: Set by user, in non drop frame format - * - decoding: Set by libavcodec (timecode in the 25 bits format, -1 if unset) - */ +#if FF_API_PRIVATE_OPT + /** @deprecated use encoder private options instead */ + attribute_deprecated int64_t timecode_frame_start; +#endif #if FF_API_RTP_CALLBACK /** |