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

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

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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 | « source/patched-ffmpeg-mt/libavformat/ingenientdec.c ('k') | source/patched-ffmpeg-mt/libavformat/m4vdec.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/internal.h
===================================================================
--- source/patched-ffmpeg-mt/libavformat/internal.h (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/internal.h (working copy)
@@ -24,6 +24,8 @@
#include <stdint.h>
#include "avformat.h"
+#define MAX_URL_SIZE 4096
+
typedef struct AVCodecTag {
enum CodecID id;
unsigned int tag;
@@ -53,6 +55,16 @@
char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase);
+/**
+ * Parse a string of hexadecimal strings. Any space between the hexadecimal
+ * digits is ignored.
+ *
+ * @param data if non-null, the parsed data is written to this pointer
+ * @param p the string to parse
+ * @return the number of bytes written (or to be written, if data is null)
+ */
+int ff_hex_to_data(uint8_t *data, const char *p);
+
void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
/**
@@ -137,11 +149,13 @@
* @param size the size of the buff buffer
* @param c the AVCodecContext of the media to describe
* @param dest_addr the destination address of the media stream, may be NULL
+ * @param dest_type the destination address type, may be NULL
* @param port the destination port of the media stream, 0 if unknown
* @param ttl the time to live of the stream, 0 if not multicast
*/
void ff_sdp_write_media(char *buff, int size, AVCodecContext *c,
- const char *dest_addr, int port, int ttl);
+ const char *dest_addr, const char *dest_type,
+ int port, int ttl);
/**
* Write a packet to another muxer than the one the user originally
@@ -182,4 +196,28 @@
#define SPACE_CHARS " \t\r\n"
+/**
+ * Callback function type for ff_parse_key_value.
+ *
+ * @param key a pointer to the key
+ * @param key_len the number of bytes that belong to the key, including the '='
+ * char
+ * @param dest return the destination pointer for the value in *dest, may
+ * be null to ignore the value
+ * @param dest_len the length of the *dest buffer
+ */
+typedef void (*ff_parse_key_val_cb)(void *context, const char *key,
+ int key_len, char **dest, int *dest_len);
+/**
+ * Parse a string with comma-separated key=value pairs. The value strings
+ * may be quoted and may contain escaped characters within quoted strings.
+ *
+ * @param str the string to parse
+ * @param callback_get_buf function that returns where to store the
+ * unescaped value string.
+ * @param context the opaque context pointer to pass to callback_get_buf
+ */
+void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,
+ void *context);
+
#endif /* AVFORMAT_INTERNAL_H */
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/ingenientdec.c ('k') | source/patched-ffmpeg-mt/libavformat/m4vdec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698