| OLD | NEW |
|---|
| 1 /** | 1 /** |
| 2 Copyright (C) 2005 Michael Ahlberg, Måns Rullgård | 2 Copyright (C) 2005 Michael Ahlberg, Måns Rullgård |
| 3 | 3 |
| 4 Permission is hereby granted, free of charge, to any person | 4 Permission is hereby granted, free of charge, to any person |
| 5 obtaining a copy of this software and associated documentation | 5 obtaining a copy of this software and associated documentation |
| 6 files (the "Software"), to deal in the Software without | 6 files (the "Software"), to deal in the Software without |
| 7 restriction, including without limitation the rights to use, copy, | 7 restriction, including without limitation the rights to use, copy, |
| 8 modify, merge, publish, distribute, sublicense, and/or sell copies | 8 modify, merge, publish, distribute, sublicense, and/or sell copies |
| 9 of the Software, and to permit persons to whom the Software is | 9 of the Software, and to permit persons to whom the Software is |
| 10 furnished to do so, subject to the following conditions: | 10 furnished to do so, subject to the following conditions: |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 uint32_t serial; | 64 uint32_t serial; |
| 65 uint32_t seq; | 65 uint32_t seq; |
| 66 uint64_t granule; | 66 uint64_t granule; |
| 67 int64_t lastpts; | 67 int64_t lastpts; |
| 68 int64_t lastdts; | 68 int64_t lastdts; |
| 69 int flags; | 69 int flags; |
| 70 const struct ogg_codec *codec; | 70 const struct ogg_codec *codec; |
| 71 int header; | 71 int header; |
| 72 int nsegs, segp; | 72 int nsegs, segp; |
| 73 uint8_t segments[255]; | 73 uint8_t segments[255]; |
| 74 int incomplete; ///< whether we're expecting a continuation in the next page |
| 74 int page_end; ///< current packet is the last one completed in the page | 75 int page_end; ///< current packet is the last one completed in the page |
| 75 void *private; | 76 void *private; |
| 76 }; | 77 }; |
| 77 | 78 |
| 78 struct ogg_state { | 79 struct ogg_state { |
| 79 uint64_t pos; | 80 uint64_t pos; |
| 80 int curidx; | 81 int curidx; |
| 81 struct ogg_state *next; | 82 struct ogg_state *next; |
| 82 int nstreams; | 83 int nstreams; |
| 83 struct ogg_stream streams[1]; | 84 struct ogg_stream streams[1]; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 106 extern const struct ogg_codec ff_old_flac_codec; | 107 extern const struct ogg_codec ff_old_flac_codec; |
| 107 extern const struct ogg_codec ff_speex_codec; | 108 extern const struct ogg_codec ff_speex_codec; |
| 108 extern const struct ogg_codec ff_theora_codec; | 109 extern const struct ogg_codec ff_theora_codec; |
| 109 extern const struct ogg_codec ff_vorbis_codec; | 110 extern const struct ogg_codec ff_vorbis_codec; |
| 110 | 111 |
| 111 extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; | 112 extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; |
| 112 | 113 |
| 113 int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size); | 114 int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size); |
| 114 | 115 |
| 115 #endif /* AVFORMAT_OGGDEC_H */ | 116 #endif /* AVFORMAT_OGGDEC_H */ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 789004:
ffmpeg roll of source to mar 9 version... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/