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/mpegvideo.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/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 97ec1f18b7..62cedf0c99 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -453,6 +453,7 @@ typedef struct MpegEncContext { // picture structure defines are loaded from mpegutils.h int picture_structure; + int64_t timecode_frame_start; ///< GOP timecode frame start number, in non drop frame format int intra_dc_precision; int frame_pred_frame_dct; int top_field_first; |