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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/nutdec.c

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * "NUT" Container Format demuxer 2 * "NUT" Container Format demuxer
3 * Copyright (c) 2004-2006 Michael Niedermayer 3 * Copyright (c) 2004-2006 Michael Niedermayer
4 * Copyright (c) 2003 Alex Beregszaszi 4 * Copyright (c) 2003 Alex Beregszaszi
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 649
650 s->data_offset= pos-8; 650 s->data_offset= pos-8;
651 651
652 if(!url_is_streamed(bc)){ 652 if(!url_is_streamed(bc)){
653 int64_t orig_pos= url_ftell(bc); 653 int64_t orig_pos= url_ftell(bc);
654 find_and_decode_index(nut); 654 find_and_decode_index(nut);
655 url_fseek(bc, orig_pos, SEEK_SET); 655 url_fseek(bc, orig_pos, SEEK_SET);
656 } 656 }
657 assert(nut->next_startcode == SYNCPOINT_STARTCODE); 657 assert(nut->next_startcode == SYNCPOINT_STARTCODE);
658 658
659 ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv);
660
659 return 0; 661 return 0;
660 } 662 }
661 663
662 static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui nt8_t *header_idx, int frame_code){ 664 static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, ui nt8_t *header_idx, int frame_code){
663 AVFormatContext *s= nut->avf; 665 AVFormatContext *s= nut->avf;
664 ByteIOContext *bc = s->pb; 666 ByteIOContext *bc = s->pb;
665 StreamContext *stc; 667 StreamContext *stc;
666 int size, flags, size_mul, pts_delta, i, reserved_count; 668 int size, flags, size_mul, pts_delta, i, reserved_count;
667 uint64_t tmp; 669 uint64_t tmp;
668 670
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 AVInputFormat nut_demuxer = { 926 AVInputFormat nut_demuxer = {
925 "nut", 927 "nut",
926 NULL_IF_CONFIG_SMALL("NUT format"), 928 NULL_IF_CONFIG_SMALL("NUT format"),
927 sizeof(NUTContext), 929 sizeof(NUTContext),
928 nut_probe, 930 nut_probe,
929 nut_read_header, 931 nut_read_header,
930 nut_read_packet, 932 nut_read_packet,
931 nut_read_close, 933 nut_read_close,
932 read_seek, 934 read_seek,
933 .extensions = "nut", 935 .extensions = "nut",
934 .metadata_conv = ff_nut_metadata_conv,
935 .codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video _tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, 936 .codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video _tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
936 }; 937 };
937 #endif 938 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698