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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/rtsp.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, 5 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 * RTSP definitions 2 * RTSP definitions
3 * Copyright (c) 2002 Fabrice Bellard 3 * Copyright (c) 2002 Fabrice Bellard
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 RTSP_SERVER_WMS, /**< Windows Media server */ 183 RTSP_SERVER_WMS, /**< Windows Media server */
184 RTSP_SERVER_NB 184 RTSP_SERVER_NB
185 }; 185 };
186 186
187 /** 187 /**
188 * Private data for the RTSP demuxer. 188 * Private data for the RTSP demuxer.
189 * 189 *
190 * @todo Use ByteIOContext instead of URLContext 190 * @todo Use ByteIOContext instead of URLContext
191 */ 191 */
192 typedef struct RTSPState { 192 typedef struct RTSPState {
193 URLContext *rtsp_hd; /* RTSP TCP connexion handle */ 193 URLContext *rtsp_hd; /* RTSP TCP connection handle */
194 194
195 /** number of items in the 'rtsp_streams' variable */ 195 /** number of items in the 'rtsp_streams' variable */
196 int nb_rtsp_streams; 196 int nb_rtsp_streams;
197 197
198 struct RTSPStream **rtsp_streams; /**< streams in this session */ 198 struct RTSPStream **rtsp_streams; /**< streams in this session */
199 199
200 /** indicator of whether we are currently receiving data from the 200 /** indicator of whether we are currently receiving data from the
201 * server. Basically this isn't more than a simple cache of the 201 * server. Basically this isn't more than a simple cache of the
202 * last PLAY/PAUSE command sent to the server, to make sure we don't 202 * last PLAY/PAUSE command sent to the server, to make sure we don't
203 * send 2x the same unexpectedly or commands in the wrong state. */ 203 * send 2x the same unexpectedly or commands in the wrong state. */
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 void ff_rtsp_close_streams(AVFormatContext *s); 455 void ff_rtsp_close_streams(AVFormatContext *s);
456 456
457 /** 457 /**
458 * Close all connection handles within the RTSP (de)muxer 458 * Close all connection handles within the RTSP (de)muxer
459 * 459 *
460 * @param rt RTSP (de)muxer context 460 * @param rt RTSP (de)muxer context
461 */ 461 */
462 void ff_rtsp_close_connections(AVFormatContext *rt); 462 void ff_rtsp_close_connections(AVFormatContext *rt);
463 463
464 #endif /* AVFORMAT_RTSP_H */ 464 #endif /* AVFORMAT_RTSP_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtpenc.c ('k') | source/patched-ffmpeg-mt/libavformat/rtsp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698