Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8429)

Unified Diff: chromium/avcodec-54.sigs

Issue 9325049: Fixup chromium specific bits after merge. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: Code review fixes. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromium/avcodec-53.sigs ('k') | chromium/avformat-53.sigs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromium/avcodec-54.sigs
diff --git a/chromium/avcodec-53.sigs b/chromium/avcodec-54.sigs
similarity index 88%
rename from chromium/avcodec-53.sigs
rename to chromium/avcodec-54.sigs
index 6cb6518a16ebc6687e62b567b3474d678ffccc56..8c5aea4fb0ecf234379bc84ff31d3577525b06df 100644
--- a/chromium/avcodec-53.sigs
+++ b/chromium/avcodec-54.sigs
@@ -9,15 +9,13 @@ AVCodec *avcodec_find_decoder(enum CodecID id);
AVFrame *avcodec_alloc_frame(void);
int av_new_packet(AVPacket *pkt, int size);
int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt);
-int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt);
-int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, const AVPacket *avpkt);
+int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options);
int avcodec_close(AVCodecContext *avctx);
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
void av_free_packet(AVPacket *pkt);
void av_init_packet(AVPacket *pkt);
int av_dup_packet(AVPacket *pkt);
void avcodec_flush_buffers(AVCodecContext *avctx);
-void avcodec_init(void);
void av_register_bitstream_filter(AVBitStreamFilter *bsf);
AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size, int keyframe);
« no previous file with comments | « chromium/avcodec-53.sigs ('k') | chromium/avformat-53.sigs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698