Piotr Bandurski
23bb85b069
riff: make the G723.1 in wav output compatible with WMP/msacm codec
Attached patch (together with demuxing patch) allows WMP/msacm G723.1 codec decode files encoded by FFmpeg.
Tested with both 6400 and 5333 mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
e2fd18d40d
lavf: factor AVStream st out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
6b38101df5
parse_packet: reset pkt->pos after it has been used
This should have no effect as it was not used in this case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Piotr Bandurski
b9c129be0f
riff: fix remuxing of G723_1 in wav
Attached patch fixes remuxing of G723.1 in wav, so the output is playable by WMP.
(It's still not enough for encoding - probably some extradata should be added to the output file
to make it playable by WMP/win codec)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Martin Storsjö
6a433fdba8
rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
Our implementation of RTMPE is heavily based on librtmp.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Michael Niedermayer
01272e7662
Revert "lavf: count skipped samples for initial timestamps."
This reverts commit 885fc05865 .
This commit caused timestamps in case of generic seeking to become
inconsistent.
13 years ago
Samuel Pitoiset
f7bfb126cd
rtmp: Move the CONFIG_ condition into the if conditions
This makes sure these calls are removed by dead code elimination
even if optimization is disabled. This fixes building without
crypto libraries without optimization.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Diego Biurrun
6b80142144
build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
The ffrtmpcrypt protocol depends on external libraries, which are
also required to compile the header file.
13 years ago
Michael Niedermayer
dc31b84cbf
rtmpproto: fix compilation without optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Paul B Mahol
3933782735
cosmetics: iff: split very long line
Also while here sort chunk ids.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Adriano Pallavicino
999c63e4ca
rtp: Only choose static payload types if the sample rate and channels are right
If using a different sample rate or number of channels, use a dynamic
payload type instead, where the parameters are passed in the SDP.
G722 is a special case where the normal rules don't apply.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Clément Bœsch
61884b9d1b
wav: init st to NULL to avoid a false-positive warning.
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.
Fixes warning:
libavformat/wav.c: In function ‘wav_read_header’:
libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
14 years ago
Samuel Pitoiset
08cd95e8a3
RTMPTE protocol support
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Samuel Pitoiset
acd554c103
RTMPE protocol support
This adds two protocols, but one of them is an internal implementation
detail just used as an abstraction layer/generalization in the code. The
RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the
tcp:// protocol. This allows moving most of the lower level logic out
from the higher level generic rtmp code.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Samuel Pitoiset
0e31088b6c
rtmp: Add ff_rtmp_calc_digest_pos()
This function is used for calculating digest position for RTMP handshake
packets.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Samuel Pitoiset
3505d5574e
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Ronald S. Bultje
fd48721849
lavf: use conditional notation for default codec in muxer declarations.
This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
13 years ago
Derek Buitenhuis
5ab855777d
wav: Add check for 'fmt' tag in SMV code
If there is a 'SMV0' tag, but no 'fmt' tag, it is possible that
'st' got used as NULL.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
13 years ago
Peter Ross
4f4eb380f0
tls: TLS/SSL server
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Peter Ross
d1146d67ca
tls: parse uri path options to underlying tcp URLContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Peter Ross
b2460858f6
tls: verify option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Peter Ross
973a758f52
tls: cafile, cert, key options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Peter Ross
1be55c82a5
av_url_split: dont let '/' char whallop '?' char
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Steven Robertson
71311d697a
Fix yuv4mpeg parsing of 'mono16' files.
'mono' came before 'mono16' in the list of colorspace alternatives,
causing files of the latter type to be parsed as the former.
13 years ago
Anton Khirnov
721113bed2
matroskadec: return more correct error code on read error.
13 years ago
Kostya Shishkov
1470ce21ce
Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
13 years ago
Mohamed Naufal Basheer
55c3a4f617
G.723.1 demuxer and decoder
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
15 years ago
Ronald S. Bultje
5354a904fe
rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
This makes usage of the macro look more natural when
used with array entries.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
13 years ago
Paul B Mahol
881e0de640
iff: pass context to av_log_ask_for_sample
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Diego Biurrun
1cf6e7dd37
mpegenc: remove disabled code
14 years ago
Paul B Mahol
ad69e778b7
iff: remove dupe ID_ANNO definition
Signed-off-by: Paul B Mahol <onemda@gmail.com>
13 years ago
Piotr Bandurski
3800facac6
riff: add G723_1 wav tag
Reveiwed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
a4f94f24b4
udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined
This happens with for example mplayer.
Fixing it in ffmpeg allows new ffmpeg to be compiled with older mplayer
which would not be possible if the fix was just in mplayer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Nicolas George
b0629366a2
lavf: make cmdutils's check_stream_specifier public.
The new function is called avformat_match_stream_specifier()
and does not include logging the error message.
13 years ago
Nicolas George
30549294ef
matroska: add support for Opus.
Opus in Matroska is still a draft.
13 years ago
Nicolas George
e62fd6619f
oggdec: add support for Opus codec.
This patch also introduces CODEC_ID_OPUS.
13 years ago
Justin Ruggles
1749e12f45
cafdec: allow larger ALAC magic cookie
It already skips any extra bytes at the end, and apparently there are some
samples in the wild with larger 'kuki' chunks.
13 years ago
Nicolas George
885fc05865
lavf: count skipped samples for initial timestamps.
If skip_samples is set and timestamps are synthesized using durations,
make them start at -skip_samples (rescaled) instead of 0,
so that the timestamp of the first undiscarded sample is 0.
13 years ago
Nicolas George
0e57d79b0c
lavf: set pkt_timebase at the same time as stream->time_base.
13 years ago
Stefano Sabatini
a8d8e868c6
lavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options are not supported
They are only supported if pthread is available.
13 years ago
Justin Ruggles
3bab7cd128
avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer
14 years ago
Justin Ruggles
c0196a14b9
caf: use int64_t for num_packets
It is used to store a value read by avio_rb64().
13 years ago
Justin Ruggles
f5a9c35f88
caf: fix 'pakt' chunk parsing
according to the CAF specification:
"... the value for mChunkSize can be greater than the actual valid content
of the packet table chunk"
13 years ago
Justin Ruggles
b0b77b9ca5
caf: support either old or new style ALAC magic kuki chunk
13 years ago
Michael Niedermayer
daa290580d
mxfdec: simplify code by using av_calloc()
Reviewed a long time ago by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Michael Niedermayer
83d6ad3616
avidec: Mark first frame as keyframe in case there are no keyframes.
This fixes seeking in filecopy.avi of Ticket504
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Stefano Sabatini
5784a46986
lavf/utils: show the number of stream in case of missing parameter
Increase feedback provided in avformat_find_stream_info().
13 years ago
Stefano Sabatini
739ec710c4
lavf/utils: suggest what to do in case of missing codec information
In particular, fix trac issue #218 .
13 years ago
Stefano Sabatini
a293549b32
lavf/utils: extend has_codec_parameters() to make it show what info is missing
Improve feedback.
13 years ago
Diego Biurrun
7a249625fd
os_support: K&R formatting cosmetics
13 years ago