wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35899 commits 40 branches 405 tags 230 MiB
Commit graph

9027 commits

Author SHA1 Message Date
Anton Khirnov
24519edf64 asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2934cd9dbf)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
f9d6b13a23 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>
(cherry picked from commit 93b78d1210)
 2011-01-26 03:43:31 +01:00
Jai Menon
c481ff1029 ffmetaenc: Use correct format specifiers. 
Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
(cherry picked from commit c0ae5152d1)
 2011-01-26 03:43:31 +01:00
Mans Rullgard
8fa28af965 tty: remove superflous #include <strings.h> 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1e48cdaac3)
 2011-01-26 03:43:30 +01:00
Georgi Chorbadzhiyski
4fee6f32e2 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>
(cherry picked from commit 6e78c8ee94)
 2011-01-26 03:43:30 +01:00
Mans Rullgard
3e8c4f9689 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>
(cherry picked from commit 6081f8c4e2)
 2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
53d3f66bae Make RTPFirstDynamicPayloadHandler static to rtpdec.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 119cc033fc)
 2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
c2ec089c5a Make ff_realmedia_mp3_dynamic_handler static. 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69ad22c7a7)
 2011-01-26 03:43:30 +01:00
Diego Elio 'Flameeyes' Pettenò
463532310a 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>
(cherry picked from commit 73a0b19ba3)
 2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
81c38db13c 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>
(cherry picked from commit f0a8676958)
 2011-01-26 03:43:29 +01:00
Martin Storsjö
4f40ec0552 rtspdec: Retry with TCP if UDP failed 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2762a7a28b)
 2011-01-26 03:43:29 +01:00
Martin Storsjo
2afd30bf7a rtspdec: Move rtsp_read_pause up, next to rtsp_read_play 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e836b1b085)
 2011-01-26 03:43:28 +01:00
Martin Storsjo
3f44e3c91a rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit aeb2de1c82)
 2011-01-26 03:43:28 +01:00
Martin Storsjo
abbc1d272e rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 93e7490ee0)
 2011-01-26 03:43:28 +01:00
Martin Storsjo
d89a08d81b rtsp: Make make_setup_request a nonstatic function 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fef5649a82)
 2011-01-26 03:43:28 +01:00
Martin Storsjö
1a172ce6b1 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>
(cherry picked from commit 2b0decf60b)
 2011-01-26 03:43:28 +01:00
Kostya
69c78161d2 reindent after last commit 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd170a)
 2011-01-26 03:43:28 +01:00
Kostya
8a485dd399 Extend WavPack demuxer and decoder to support >2 channel audio 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3bdc886c22)
 2011-01-26 03:43:28 +01: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
Jai Menon
9de202a633 ffmetaenc : Use more correct format specifiers. 
Additionally, this fixes a warning when building with clang.
 2011-01-24 22:55:43 -06: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
Baptiste Coudurier
d4e0130e46 In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it. 
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
 2011-01-24 14:20:48 -08: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
5b7e7544e1 mp3enc: support for id3v2.3 tags using a per-muxer AVOption 
fixes issue2562.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 22272f61bb)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
fe01dd8d74 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>
(cherry picked from commit cb6bc57681)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
5052830fec 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>
(cherry picked from commit 8c3caf7fb1)
 2011-01-23 19:32:07 +01:00
Clément Bœsch
204a18151c Move ID3v1 skip from decoder to demuxer 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52d)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
b6125545da 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>
(cherry picked from commit 187e23478b)
 2011-01-23 19:32:07 +01:00
Anton Khirnov
6e89b61293 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>
(cherry picked from commit dccbd97d72)
 2011-01-23 19:32:06 +01:00
Anton Khirnov
e910a77b0d avio: add av_put_str and deprecate put_strz in favor of it 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4efd5cf34b)
 2011-01-23 19:32:06 +01:00