RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,890 Commits 36 Branches 392 Tags 255 MiB
Commit Graph

8550 Commits

Author SHA1 Message Date
Hendrik Leppkes 1a7090bfaf mov: support eac3 audio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:52:55 +02:00
Michael Niedermayer a0a4b13322 mpegts: remove read_seek() 
Its redundant

Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:35:07 +02:00
Michael Niedermayer 08d4408a90 utils: disable debuging code at the end of av_gen_search() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:27:02 +02:00
Michael Niedermayer f73f68b894 utils: flush on successfull av_seek_frame_binary() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 22:26:13 +02:00
Michael Niedermayer db1347f66e mpegts: cache information to speed up seeking. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 21:13:20 +02:00
Michael Niedermayer 27f7589ab1 seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 
points but rather seek to the min/max.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 20:45:00 +02:00
Michael Niedermayer 7846280d1d mpegts: assert position in dts reading code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 18:06:18 +02:00
Michael Niedermayer de9862a95e mpegts: add and use mpegts_get_dts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 18:06:18 +02:00
Michael Niedermayer 04ac0d7994 mpegts: fix type of argument of mpegts_resync() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 18:06:18 +02:00
Michael Niedermayer ce253edf4e fix shared lib build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 02:27:33 +02:00
Michael Niedermayer dd8ffc1925 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (47 commits)
  lavc: hide private symbols.
  lavc: deprecate img_get_alpha_info().
  lavc: use avpriv_ prefix for ff_toupper4.
  lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
  lavc: use avpriv_ prefix for ff_ac3_parse_header.
  lavc: use avpriv_ prefix for ff_frame_rate_tab.
  lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
  lavc: use avpriv_ prefix for ff_split_xiph_headers.
  lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
  lavc: use avpriv_ prefix for some dv symbols used in lavf.
  lavc: use avpriv_ prefix for some flac symbols used in lavf.
  lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
  lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
  lavc: use avpriv_ prefix for ff_aac_parse_header().
  lavf: hide private symbols.
  lavf: use avpriv_ prefix for some dv functions.
  lavf: use avpriv_ prefix for ff_new_chapter().
  avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
  avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
  avcodec: clarify documentation of CODEC_CAP_DELAY
  ...

Conflicts:
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dv.c
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/libspeexenc.c
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/avidec.c
	libavformat/dv.c
	libavformat/dv.h
	libavformat/flvenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/oggparsespeex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-21 02:01:26 +02:00
Anton Khirnov 0842d58998 lavc: use avpriv_ prefix for ff_toupper4. 
It's used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 9f51c682ee lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. 
They are used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 6f89efeaa7 lavc: use avpriv_ prefix for ff_ac3_parse_header. 
It's used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 9138a130cd lavc: use avpriv_ prefix for ff_frame_rate_tab. 
It's used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 773375c3d0 lavc: rename ff_find_start_code to avpriv_mpv_find_start_code 
It's used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 357db4c263 lavc: use avpriv_ prefix for ff_split_xiph_headers. 
It's used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 2361e59b98 lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. 
It's used in lavf.
 2011-10-20 21:06:58 +02:00
Anton Khirnov 242c73a0fd lavc: use avpriv_ prefix for some dv symbols used in lavf. 
Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
 2011-10-20 21:06:58 +02:00
Anton Khirnov d9cca9fc6a lavc: use avpriv_ prefix for some flac symbols used in lavf. 
Specifically, ff_flac_parse_streaminfo, ff_flac_is_extradata_valid and
ff_flac_parse_block_header
 2011-10-20 21:06:58 +02:00
Anton Khirnov 59a9a23581 lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. 
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
 2011-10-20 21:06:57 +02:00
Anton Khirnov 82ab61f901 lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. 
Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header,
ff_mpegaudio_decode_header.
 2011-10-20 21:06:57 +02:00
Anton Khirnov 73ae27e17b lavc: use avpriv_ prefix for ff_aac_parse_header(). 
It's used in lavf.
 2011-10-20 21:06:57 +02:00
Anton Khirnov 8d74bf17c6 lavf: hide private symbols. 
Overhead as reported by rbelf-size goes from 40147 to 20877.
 2011-10-20 21:06:45 +02:00
Anton Khirnov ab88b25f99 lavf: use avpriv_ prefix for some dv functions. 
They are used in libavdevice.
 2011-10-20 20:57:23 +02:00
Anton Khirnov 1fa395e471 lavf: use avpriv_ prefix for ff_new_chapter(). 
It's used in libavdevice.
 2011-10-20 20:57:23 +02:00
Justin Ruggles 9ef6c7977f avformat: do not require frame_size for Speex. 
Having it there forces decoding of a frame in order to get frame_size, but it
is not really needed for proper demuxing or decoding.
 2011-10-20 13:06:16 -04:00
Justin Ruggles 0e69c04773 ogg/speex: set correct timestamp and duration for the first packet. 
The first timestamp should be negative due to delay.
Also, do not set AVCodecContext.frame_size unnecessarily.
 2011-10-20 13:06:16 -04:00
Justin Ruggles 4ee247a2bd flvenc: check packet duration in speex using timestamps 
Using AVCodecContext.frame_size is not reliable.
 2011-10-20 13:06:16 -04:00
Justin Ruggles 52375ba567 flvenc: adjust for negative DTS for all codecs, not just H.264 2011-10-20 13:06:15 -04:00
Michael Niedermayer d0492578c8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  presets: rename presets directory
  lavc: make avcodec_get_context_defaults3 "officially" public
  lavf: replace av_new_stream->avformat_new_stream part II.
  lavf,lavd: replace av_new_stream->avformat_new_stream part I.
  lavf: add avformat_new_stream as a replacement for av_new_stream.
  Use correct scaling table for bwd-pred MVs in second B-field
  Ut Video decoder
  Makefile: change presets extension to .avpreset
  lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
  lavfi: add testsrc source
  AVOptions: add documentation.
  presets: update libx264 ffpresets

Conflicts:
	Changelog
	doc/APIchanges
	doc/ffmpeg.texi
	ffpresets/libx264-ipod320.ffpreset
	ffpresets/libx264-ipod640.ffpreset
	ffserver.c
	libavcodec/avcodec.h
	libavcodec/options.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavfilter/avfilter.h
	libavfilter/vsrc_testsrc.c
	libavformat/flvdec.c
	libavformat/riff.c
	libavformat/version.h
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-20 02:34:51 +02:00
Laurent Aimar bc38e83793 mpegts: do not return from ff_mpegts_parse_packet() after having seen the first PMT 
It prevents leaving the AVPacket uninitialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-19 23:28:05 +02:00
Laurent Aimar 49ec0c818d mpegts: fix return value when enough ts packets have been parsed or when the first PMT has been seen. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-19 23:28:05 +02:00
Michael Niedermayer e31c5ebe11 mpegtsenc: fix handling of large audio packets 
(sorry i have no sample, just a user report)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-19 23:04:31 +02:00
Reimar Döffinger 6ea6ff053a Do not call parse_keyframes_index with NULL stream. 
Seems to fix trac issue #569.
Sample is unfortunately not available, but it might be caused by
an index existing for non-existing audio stream (?).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-19 18:54:58 +02:00
Anton Khirnov 84ad31ff18 lavf: replace av_new_stream->avformat_new_stream part II. 
Manual replacements are done in this commit.

In many cases, the id is some constant made up number (e.g. 0 for video
and 1 for audio), which is then not used in the demuxer for anything.
Those ids are removed.
 2011-10-19 17:02:11 +02:00
Anton Khirnov 3b3bbdd3e6 lavf,lavd: replace av_new_stream->avformat_new_stream part I. 
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
 2011-10-19 17:02:11 +02:00
Anton Khirnov 569129a6dc lavf: add avformat_new_stream as a replacement for av_new_stream. 
It takes a codec parameter, thus enabling codec-specific defaults.
 2011-10-19 17:02:11 +02:00
Carl Eugen Hoyos 891f76b0a8 Fix AMR block length for no data mode when muxing mov. 
Fixes ticket #550.
This had been analyzed and reported by Igor Levin, igor d levin comverse com
 2011-10-19 11:20:48 +02:00
Kostya Shishkov 0d8506b8c5 Ut Video decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-19 08:24:19 +02:00
Michael Niedermayer be401448e5 mov: Raise ctts dts_shift threshold by 1 
This fixes issue2246neu.mp4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-19 02:56:41 +02:00
Chris Kennedy c108a4aa1e fix memleak in packet corrupt dropping code 2011-10-18 12:00:48 +02:00
Michael Niedermayer c4e02d3432 avidec: Dont switch to NI mode if there is no index. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-18 03:34:57 +02:00
Carl Eugen Hoyos 39f6733f05 Do not try to parse empty strf tags. 2011-10-18 03:30:03 +02:00
Michael Niedermayer fae714a9fb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: add presets
  rtsp: Expose the flag options via private AVOptions for sdp and rtp, too
  rtsp: Make the rtsp flags avoptions set via a define
  rtpenc: Set a default video codec
  avoptions: Fix av_opt_flag_is_set
  rtp: Fix ff_rtp_get_payload_type
  doc: Update the documentation on setting options for RTSP
  rtsp: Remove the separate filter_source variable
  rtsp: Accept options via private avoptions instead of URL options
  rtsp: Simplify AVOption definitions
  rtsp: Merge the AVOption lists
  lavfi: port libmpcodecs delogo filter
  lavfi: port boxblur filter from libmpcodecs
  lavfi: add negate filter
  lavfi: add LUT (LookUp Table) generic filters
  AVOptions: don't segfault on NULL parameter in av_set_options_string()
  avio: Check for invalid buffer length.
  mpegenc/mpegtsenc: add muxrate private options.
  lavf: deprecate AVFormatContext.file_size
  mov: add support for TV metadata atoms tves, tvsn and stik

Conflicts:
	Changelog
	doc/filters.texi
	doc/protocols.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/internal.h
	libavfilter/vf_boxblur.c
	libavfilter/vf_delogo.c
	libavfilter/vf_lut.c
	libavformat/mpegtsenc.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-18 01:54:40 +02:00
Derek Buitenhuis 1de357d6da libutvideo: Add Ut Video Decoder Wrapper 
Add a wrapper for libutvideo's decoder.

This supports decoding the following FOURCCs:
    ULY0 - 4:2:0 YCbCr
    ULY2 - 4:2:2 YCbCr
    ULRG - RGB
    ULRA - RGBA

Also, bump version.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-17 23:44:12 +02:00
Martin Storsjö 51369f2891 rtsp: Expose the flag options via private AVOptions for sdp and rtp, too 
This allows setting the filter_src option for these demuxers, too,
which wasn't possible at all before (where the option only was set
via URL parameters for RTSP).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-10-17 22:02:31 +03:00
Martin Storsjö 3a6765fb5d rtsp: Make the rtsp flags avoptions set via a define 
This helps sharing these options with the sdp and rtp demuxers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-10-17 22:02:30 +03:00
Martin Storsjö 9f938ca5e6 rtpenc: Set a default video codec 
avconv doesn't map video streams to a muxer without specifying a
manual stream mapping if the default video codec is CODEC_ID_NONE.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-10-17 22:02:20 +03:00
Martin Storsjö 2e69dd66b6 rtp: Fix ff_rtp_get_payload_type 
It was broken in 3b3ea34655
"Remove all uses of deprecated AVOptions API", where any
presence of a payload_type AVOption caused its value to
be returned, even if it wasn't set (and thus had the default
-1 value).

This caused the RTP muxer to be broken.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-10-17 20:40:20 +03:00