9d73e30253
ff_gen_search: make step 64it to prevent hypothetical integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-18 20:47:07 +02:00
1f87cbe834
Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
...
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
avf: move url utility functions in a separate file
Conflicts:
libavformat/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-17 00:09:31 +02:00
8097307bfb
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
...
* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
avf: move ff_write_chained to mux.c
Conflicts:
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-16 23:58:59 +02:00
bbdef61850
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
...
* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
avf: move riff tags accessors where they belong
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-16 23:52:08 +02:00
84f77f8423
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
...
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
avf: move ff_http_match_no_proxy to network
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-16 23:45:42 +02:00
4a522eff00
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
...
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-06-16 23:38:27 +02:00
e997afdfc6
lavf: show APIC for tta files too
...
Fixes #2676 .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-06-16 18:56:56 +00:00
df9f22d42b
avf: move url utility functions in a separate file
2013-06-16 15:01:39 +02:00
12db891dcd
avf: move ff_write_chained to mux.c
2013-06-16 14:41:07 +02:00
508998f7d5
avf: move riff tags accessors where they belong
2013-06-16 14:41:07 +02:00
ec7c51c786
avf: move ff_http_match_no_proxy to network
...
It is only used by network protocols.
2013-06-16 14:41:00 +02:00
afc8685395
avf: split off format register and lookup function
2013-06-16 14:00:40 +02:00
d5f7f1fef1
audio frame multi-threaded decoding
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-06-05 22:35:31 +00:00
f6beb36115
Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'
...
* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
lavf: preserve side data when parsing packets.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-28 09:51:19 +02:00
c330eba84c
lavf: preserve side data when parsing packets.
2013-05-28 08:00:07 +02:00
c54a1565f5
avformat/utils: Keep internal and external av_read_frame() packets in sync.
...
Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.
BUG=242786
TEST=ffmpeg_regression_tests
Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-23 03:29:47 +02:00
efc08e00cc
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
...
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
vf_aspect: use the name 's' for the pointer to the private context
Remove commented-out debug #define cruft
Conflicts:
libavcodec/4xm.c
libavcodec/dvdsubdec.c
libavcodec/ituh263dec.c
libavcodec/mpeg12.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c
libavfilter/vf_fieldorder.c
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-16 09:56:43 +02:00
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
f083b4c338
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
...
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-05 12:31:03 +02:00
e0f8be6413
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
2013-05-04 21:43:06 +02:00
30db867cb7
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/matroskaenc: return an error for unsupported types.
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
lavf: call the new seek API from the old.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-04 17:10:48 +02:00
3fc66dfef2
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
...
Also document that it has no effect.
2013-05-04 14:11:53 +02:00
cc24afb45c
lavf: call the new seek API from the old.
...
If the demuxer implements read_seek2() and not read_seek(),
call avformat_seek_file() from av_seek_frame().
Allow to properly seek in formats that only implement the
new API from applications that use the old one.
Tested with mplayer and a concat script.
2013-05-04 14:11:53 +02:00
0104570fb6
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
...
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-04 10:17:52 +02:00
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
ad56535dd1
avformat: fix orig_pos type to match pkt->pos
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-04-23 13:56:34 +00:00
833bc6678f
avformat: change seeking index consistency asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-19 17:44:07 +02:00
020c287f5e
avformat: Dont stop probing before the whole id3 tag is read
...
When a file appears to start with a id3 tag and appears to
also be something else, then try to increase the probe buffer
size if its below its limit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-18 23:48:32 +02:00
ab2989378f
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
...
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
lavf: make sure stream probe data gets freed.
avfiltergraph: set deprecated filter_count.
Conflicts:
libavformat/utils.c
See: 44a7a6300dmichaelni@gmx.at >
2013-04-04 13:24:33 +02:00
dbb1425811
lavf: make sure stream probe data gets freed.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-04-04 07:54:00 +02:00
e10f5bd05c
avformat: Add a mechanism to allow demuxers to detect byte based seeking.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-04 04:04:24 +02:00
ccc25378bd
avformat: fix atomatic format selection for (s)segment
...
Fixes Ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-02 21:52:40 +02:00
4d3c5d3b65
Do not show "Estimating duration from bitrate" warning if no duration was estimated.
2013-03-30 08:24:51 +01:00
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-29 17:40:28 +01:00
ea9a6709a9
estimate_timings_from_bit_rate: Check timebase and bitrate
...
Fixes integer overflow and assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-28 01:45:01 +01:00
460d30406b
avformat: change some seeking related assert to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-27 22:53:57 +01:00
710cd0fddf
avformat: Fix infinite probing that reads the whole file
...
Fixes: otonajoshi_avformat_tries_to_load_whole.ts
Reported-by: JEEB (on IRC)
Thanks-to: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-20 17:57:00 +01:00
06a43baecd
av_find_stream_info: change read_size to 64bit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-20 17:23:23 +01:00
0d09aa9d8e
lavf: avformat_seek_file(): validate stream_index.
2013-03-20 13:35:24 +01:00
73ef12757b
append_packet_chunked: remove outcommented code
...
our variant works fine and should be better
also remove related unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-18 17:54:01 +01:00
07d4f557e5
append_packet_chunked: Remove unused initialization.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-16 17:03:41 +01:00
e066fb54cb
Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'
...
* commit 'aa3c77998404cc32233cb76e961ca27db8565459':
lavf: sanity check size in av_get/append_packet().
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-16 15:38:13 +01:00
aa3c779984
lavf: sanity check size in av_get/append_packet().
...
To avoid allocating ridiculous amounts of memory for corrupted files,
read the input in chunks limited to filesize or an arbitrary large
amount when that is not known (chosen to be 50M).
2013-03-15 20:05:04 +01:00
06a8350599
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
...
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
lavf: remove disabled FF_API_AV_GETTIME cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-13 12:37:03 +01:00
c292e340ed
avformat: keep r_frame_rate
...
This field is used and nothing equivalent exists
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-12 15:28:23 +01:00
85a5bc054c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
7b486ab13b
lavf: remove disabled FF_API_AV_GETTIME cruft
2013-03-11 18:23:18 +01:00
435c2a31ad
lavf: remove disabled FF_API_READ_PACKET cruft
2013-03-11 18:23:02 +01:00
0a7c4daf46
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
2013-03-11 18:22:45 +01:00
2653e12520
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
...
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-08 19:12:03 +01:00
