Anton Khirnov
225b6d7fde
mov: simplify mov_read_chapters() by using avio_get_str16be
...
It probably also fixes a memleak or two.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 22:03:21 +00:00
Mans Rullgard
c4f8765ac5
Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
...
This reverts commit c34461b35b
.
The wrong version of the patch was committed.
2011-01-26 22:03:21 +00:00
Diego Elio Pettenò
2d162e3825
Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.
...
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:04 +00:00
Georgi Chorbadzhiyski
535638b55f
mpegtsenc: set reserved bits to 1 in PCR field
...
The reserved bits between PCR base and extension fields must be
set to 1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 00:02:42 +00:00
Diego Elio Pettenò
57c4d01ec9
Make ff_rtsp_send_cmd_with_content_async static to rtsp.c.
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 22:10:36 +01:00
Diego Elio Pettenò
a3dffc0627
Make ff_mxf_pixel_layouts static to mxf.c.
...
Also make it an anonymous structure as never it is accessed by name.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Diego Elio Pettenò
101e1f6ff9
Make ff_interleave_compare_dts static to utils.c.
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Anton Khirnov
c34461b35b
mov: simplify mov_read_chapters() by using avio_get_str16be
...
It probably also fixes a memleak or two.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Anton Khirnov
2934cd9dbf
asfdec: remove some commented-out cruft
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Anton Khirnov
93b78d1210
lavf: make a variant of ff_get_str16_nolen public
...
It will be useful in mp3 demuxer and hopeful some other places.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Jai Menon
c0ae5152d1
ffmetaenc: Use correct format specifiers.
...
Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
2011-01-25 17:34:11 +00:00
Mans Rullgard
1e48cdaac3
tty: remove superflous #include <strings.h>
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 15:57:53 +00:00
Georgi Chorbadzhiyski
6e78c8ee94
mpegtsenc: remove unused variables
...
Remove two variables that were not used and caused the following
warnings:
CC libavformat/mpegtsenc.o
libavformat/mpegtsenc.c: In function 'mpegts_write_section':
libavformat/mpegtsenc.c:72:18: warning: unused variable 'ts'
libavformat/mpegtsenc.c: In function 'mpegts_insert_null_packet':
libavformat/mpegtsenc.c:586:18: warning: unused variable 'ts'
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 12:52:45 +00:00
Mans Rullgard
6081f8c4e2
avidec: make print_tag() a macro and remove related ifdefs
...
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 02:43:28 +00:00
Diego Elio Pettenò
119cc033fc
Make RTPFirstDynamicPayloadHandler static to rtpdec.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 01:45:34 +00:00
Diego Elio Pettenò
69ad22c7a7
Make ff_realmedia_mp3_dynamic_handler static.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 01:37:32 +00:00
Diego Elio 'Flameeyes' Pettenò
73a0b19ba3
Don't check for DEBUG before using dprintf.
...
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 00:25:50 +00:00
Diego Elio Pettenò
f0a8676958
Make dvenc.c functions static to the unit.
...
Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 00:02:12 +00:00
Martin Storsjö
2762a7a28b
rtspdec: Retry with TCP if UDP failed
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 22:49:36 +01:00
Martin Storsjo
e836b1b085
rtspdec: Move rtsp_read_pause up, next to rtsp_read_play
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 22:46:45 +01:00
Martin Storsjo
aeb2de1c82
rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 22:46:43 +01:00
Martin Storsjo
93e7490ee0
rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 22:46:39 +01:00
Martin Storsjo
fef5649a82
rtsp: Make make_setup_request a nonstatic function
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 22:46:36 +01:00
Martin Storsjö
2b0decf60b
applehttp: Fix the key check in handle_variant_args
...
The key string is supposed to contain the equals character,
too. Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 20:19:37 +00:00
Kostya
dacbcd170a
reindent after last commit
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 20:46:58 +01:00
Kostya
3bdc886c22
Extend WavPack demuxer and decoder to support >2 channel audio
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 20:46:58 +01:00
Anton Khirnov
22272f61bb
mp3enc: support for id3v2.3 tags using a per-muxer AVOption
...
fixes issue2562.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-22 02:06:14 +01:00
Anton Khirnov
cb6bc57681
id3v2: split tables for various ID3v2 versions
...
This is needed for upcoming ID3v2.3 muxing support.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-22 02:06:10 +01:00
Anton Khirnov
8c3caf7fb1
mp3enc: handle errors in id3v2_put_ttag
...
make the initialization of put clearer
this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478b
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-22 02:04:13 +01:00
Clément Bœsch
045b80e52d
Move ID3v1 skip from decoder to demuxer
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-22 01:31:57 +01:00
Anton Khirnov
187e23478b
mp3enc: add support for writing UTF-16 tags
...
Also it gets rid of some mysterious magic numbers in code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 21:52:41 +00:00
Anton Khirnov
dccbd97d72
lavf: move ff_put_str16_nolen from asf to avio and rename it
...
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 20:21:51 +00:00
Anton Khirnov
4efd5cf34b
avio: add av_put_str and deprecate put_strz in favor of it
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 20:21:03 +00:00
Anton Khirnov
50196a982b
lavf: move the version macros to a new header
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 19:30:51 +00:00
Anton Khirnov
d66eff3685
id3v2: use an enum for encodings instead of magic numbers.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 18:42:10 +00:00
Anton Khirnov
d08928bbea
Split mp3 demuxer and muxer into separate files.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 15:11:52 +00:00
Janne Grunau
e5fe65512b
mpegtsenc: prefer metadata keyed with "service_name"
...
title metadata is only used as fallback if no service_name is available.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-20 15:28:32 +01:00
Georgi Chorbadzhiyski
e8315e7881
Set service_provider and service_name in mpegts demuxer
...
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 13:42:27 +00:00
Anton Khirnov
75aded8328
id3v2: don't overwrite existing tags
...
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.
fixes issue2419
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 13:39:19 +00:00
Anton Khirnov
f7fcd6a254
id3v2: convert metadata after all the tags were read
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 13:36:28 +00:00
Anton Khirnov
46a2da7698
id3v2: make ff_id3v2_parse static
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 13:36:22 +00:00
Georgi Chorbadzhiyski
69688e71bc
Add service_provider and service_name metadata
...
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.
Example usage:
ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
-metadata service_provider="Some provider" \
-metadata service_name="Some Channel" \
"udp://239.0.70.2:5000?pkt_size=1316&ttl=1"
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 11:31:20 +00:00
Janne Grunau
2c3589bfda
consolidate .gitignore patters into a single file
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00
Justin Ruggles
f61cbc22d3
Revise check for codec id in voc demuxer.
...
This fixes demuxing of packets that do not contain a codec tag and come before the codec_id has been set.
2011-01-18 13:07:17 -05:00
Justin Ruggles
1ae02fe03b
Fix bug in voc demuxer that was introduced in SVN r26309.
...
Fixes issue 2560.
2011-01-18 12:15:36 -05:00
Reimar Döffinger
54bc640362
Missing parts of IVF muxer support.
2011-01-18 08:00:23 +01:00
Reimar Döffinger
326851b9bc
Add muxer for IVF format.
2011-01-17 21:11:51 +01:00
John Wimer
b79c3df088
prevent integer overflow in calculating duration
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-01-17 17:05:58 +02:00
Janne Grunau
348b8218f7
convert svn:ignore properties to .gitignore files
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 15:50:14 +01:00
Michael Niedermayer
8bb7d97be0
Check 4xm headers for validity. This should avoid 1/0.
...
Originally committed as revision 26392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 18:22:29 +00:00