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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/internal.h

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * copyright (c) 2001 Fabrice Bellard 2 * copyright (c) 2001 Fabrice Bellard
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 * 124 *
125 * Note, this requires networking to be initialized, so the caller must 125 * Note, this requires networking to be initialized, so the caller must
126 * ensure ff_network_init has been called. 126 * ensure ff_network_init has been called.
127 * 127 *
128 * @see ff_url_split 128 * @see ff_url_split
129 * 129 *
130 * @param str the buffer to fill with the url 130 * @param str the buffer to fill with the url
131 * @param size the size of the str buffer 131 * @param size the size of the str buffer
132 * @param proto the protocol identifier, if null, the separator 132 * @param proto the protocol identifier, if null, the separator
133 * after the identifier is left out, too 133 * after the identifier is left out, too
134 * @param authorization an optional authorization string, may be null 134 * @param authorization an optional authorization string, may be null.
135 * An empty string is treated the same as a null string.
135 * @param hostname the host name string 136 * @param hostname the host name string
136 * @param port the port number, left out from the string if negative 137 * @param port the port number, left out from the string if negative
137 * @param fmt a generic format string for everything to add after the 138 * @param fmt a generic format string for everything to add after the
138 * host/port, may be null 139 * host/port, may be null
139 * @return the number of characters written to the destination buffer 140 * @return the number of characters written to the destination buffer
140 */ 141 */
141 int ff_url_join(char *str, int size, const char *proto, 142 int ff_url_join(char *str, int size, const char *proto,
142 const char *authorization, const char *hostname, 143 const char *authorization, const char *hostname,
143 int port, const char *fmt, ...); 144 int port, const char *fmt, ...);
144 145
(...skipping 22 matching lines...) Expand all
167 * @param dst the muxer to write the packet to 168 * @param dst the muxer to write the packet to
168 * @param dst_stream the stream index within dst to write the packet to 169 * @param dst_stream the stream index within dst to write the packet to
169 * @param pkt the packet to be written 170 * @param pkt the packet to be written
170 * @param src the muxer the packet originally was intended for 171 * @param src the muxer the packet originally was intended for
171 * @return the value av_write_frame returned 172 * @return the value av_write_frame returned
172 */ 173 */
173 int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, 174 int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
174 AVFormatContext *src); 175 AVFormatContext *src);
175 176
176 #endif /* AVFORMAT_INTERNAL_H */ 177 #endif /* AVFORMAT_INTERNAL_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/http.c ('k') | source/patched-ffmpeg-mt/libavformat/isom.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698