aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorOded Shimon <ods15@ods15.dyndns.org>2006-11-17 14:43:14 +0000
committerOded Shimon <ods15@ods15.dyndns.org>2006-11-17 14:43:14 +0000
commita851cf8cf7bfceec1e26aa7edf131499ebd609a0 (patch)
tree97ac081992d02d28739111883acc83897b55b5c6 /libavformat
parentb615c1edfcdf9fabfc1b92a3b155a7bce6543153 (diff)
downloadffmpeg-a851cf8cf7bfceec1e26aa7edf131499ebd609a0.tar.gz
update to libnut API, changes to frame_table_input
Originally committed as revision 7114 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/libnut.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index fe5efca748..d2d05cde61 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -18,32 +18,32 @@ static const CodecTag nut_tags[] = {
};
#ifdef CONFIG_MUXERS
-frame_table_input_t ft_default[] = {
- // There must be atleast this safety net:
- //{ 4128, 3, 0, 1, 0, 0, 0 },
- //{ flag, fields, pts, mul, stream, size, count }
- { 8192, 0, 0, 1, 0, 0, 0 }, // invalid 0x00
- { 56, 0, 0, 1, 0, 0, 0 }, // safety net non key frame
- { 56, 0, 0, 1, 0, 0, 0 }, // safety net key frame
- { 4128, 0, 0, 1, 0, 0, 0 }, // one more safety net
- { 27, 0, 0, 1, 0, 0, 0 }, // EOR frame
- { 1, 4, 1, 337, 1, 336, 0 }, // used 82427 times
- { 1, 4, 1, 385, 1, 384, 0 }, // used 56044 times
- { 0, 4, 2, 7, 0, 6, 0 }, // used 20993 times
- { 0, 4, 1, 7, 0, 6, 0 }, // used 10398 times
- { 1, 4, 1, 481, 1, 480, 0 }, // used 3527 times
- { 1, 4, 1, 289, 1, 288, 0 }, // used 2042 times
- { 1, 4, 1, 577, 1, 576, 0 }, // used 1480 times
- { 1, 4, 1, 673, 1, 672, 0 }, // used 862 times
- { 1, 4, 1, 769, 1, 768, 0 }, // used 433 times
- { 1, 4, 1, 961, 1, 960, 0 }, // used 191 times
- { 32, 3, 2, 101, 0, 0, 0 }, // "1.2.0" => 14187
- { 32, 3, -1, 40, 0, 0, 0 }, // "1.-1.0" => 5707
- { 32, 3, 1, 81, 0, 0, 0 }, // "1.1.0" => 11159
- { 33, 3, 1, 11, 0, 0, 0 }, // "1.1.1" => 1409
- { 105, 3, 0, 6, 0, 0, 0 }, // checksum for video
- { 8192, 2, 0, 1, 0, 0, 0 }, // invalid 0xFF
- { -1, 0, 0, 0, 0, 0, 0 }, // end
+nut_frame_table_input_t ft_default[] = {
+ // There must be atleast this safety net:
+ //{ 4128, 0, 0, 1, 0, 1 },
+ //{ flag, pts, stream, mul, size, count }
+ { 8192, 0, 0, 1, 0, 1 }, // invalid 0x00
+ { 56, 0, 0, 1, 0, 1 }, // safety net non key frame
+ { 57, 0, 0, 1, 0, 1 }, // safety net key frame
+ { 4128, 0, 0, 1, 0, 1 }, // one more safety net
+ { 27, 0, 0, 1, 0, 1 }, // EOR frame
+ { 1, 1, 1, 337, 336, 1 }, // used 82427 times
+ { 1, 1, 1, 385, 384, 1 }, // used 56044 times
+ { 0, 2, 0, 7, 6, 1 }, // used 20993 times
+ { 0, 1, 0, 7, 6, 1 }, // used 10398 times
+ { 1, 1, 1, 481, 480, 1 }, // used 3527 times
+ { 1, 1, 1, 289, 288, 1 }, // used 2042 times
+ { 1, 1, 1, 577, 576, 1 }, // used 1480 times
+ { 1, 1, 1, 673, 672, 1 }, // used 862 times
+ { 1, 1, 1, 769, 768, 1 }, // used 433 times
+ { 1, 1, 1, 961, 960, 1 }, // used 191 times
+ { 32, 2, 0, 101, 0, 101 }, // "1.2.0" => 14187
+ { 32, -1, 0, 40, 0, 40 }, // "1.-1.0" => 5707
+ { 32, 1, 0, 81, 0, 81 }, // "1.1.0" => 11159
+ { 33, 1, 0, 11, 0, 11 }, // "1.1.1" => 1409
+ { 105, 0, 0, 6, 0, 6 }, // checksum for video
+ { 8192, 0, 0, 1, 0, 1 }, // invalid 0xFF
+ { -1, 0, 0, 0, 0, 0 }, // end
};
static int av_write(void * h, size_t len, const uint8_t * buf) {