diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/ffmpeg/libavcodec/internal.h | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/internal.h')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/internal.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/internal.h b/chromium/third_party/ffmpeg/libavcodec/internal.h index 4962f064e10..89592437c00 100644 --- a/chromium/third_party/ffmpeg/libavcodec/internal.h +++ b/chromium/third_party/ffmpeg/libavcodec/internal.h @@ -82,7 +82,7 @@ typedef struct AVCodecInternal { * Internal sample count used by avcodec_encode_audio() to fabricate pts. * Can be removed along with avcodec_encode_audio(). */ - int sample_count; + int64_t sample_count; #endif /** @@ -140,11 +140,6 @@ int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); void avpriv_color_frame(AVFrame *frame, const int color[4]); -/** - * Remove and free all side data from packet. - */ -void ff_packet_free_side_data(AVPacket *pkt); - extern volatile int ff_avcodec_locked; int ff_lock_avcodec(AVCodecContext *log_ctx); int ff_unlock_avcodec(void); @@ -207,8 +202,6 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame); int ff_thread_can_start_frame(AVCodecContext *avctx); -int ff_get_logical_cpus(AVCodecContext *avctx); - int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); /** |