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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/rtpenc.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 * RTP muxer definitions 2 * RTP muxer 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 /* rtcp sender statistics */ 43 /* rtcp sender statistics */
44 unsigned int packet_count; // TODO: move into statistics (outgoing) 44 unsigned int packet_count; // TODO: move into statistics (outgoing)
45 unsigned int octet_count; // TODO: move into statistics (outgoing) 45 unsigned int octet_count; // TODO: move into statistics (outgoing)
46 unsigned int last_octet_count; // TODO: move into statistics (outgoing) 46 unsigned int last_octet_count; // TODO: move into statistics (outgoing)
47 int first_packet; 47 int first_packet;
48 /* buffer for output */ 48 /* buffer for output */
49 uint8_t *buf; 49 uint8_t *buf;
50 uint8_t *buf_ptr; 50 uint8_t *buf_ptr;
51 51
52 int max_frames_per_packet; 52 int max_frames_per_packet;
53
54 /**
55 * Number of bytes used for H.264 NAL length, if the MP4 syntax is used
56 * (1, 2 or 4)
57 */
58 int nal_length_size;
53 }; 59 };
54 60
55 typedef struct RTPMuxContext RTPMuxContext; 61 typedef struct RTPMuxContext RTPMuxContext;
56 62
57 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m); 63 void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
58 64
59 void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size); 65 void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
60 void ff_rtp_send_h263(AVFormatContext *s1, const uint8_t *buf1, int size); 66 void ff_rtp_send_h263(AVFormatContext *s1, const uint8_t *buf1, int size);
61 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size); 67 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
62 void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size); 68 void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size);
63 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size); 69 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
64 70
65 #endif /* AVFORMAT_RTPENC_H */ 71 #endif /* AVFORMAT_RTPENC_H */
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtmpproto.c ('k') | source/patched-ffmpeg-mt/libavformat/rtpenc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698