generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,090 Commits 24 Branches 241 Tags 173 MiB
1946ad4d8c
Commit Graph

1499 Commits

Author SHA1 Message Date
Michael Niedermayer
e5c338ba7a avformat/utils: assert position monotonicity in ff_find_last_ts() 
This ensures that no read timestamp functions finds packets before the search window in ff_find_last_ts()
which could cause an infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 01:45:13 +02:00
Michael Niedermayer
a5d67bc796 avformat/utils: Fix bitrate overflow check 
The check added in df33a58e53 does not work
at all, rather it broke the summing of bitrates completely.
The comparission was wrong way around.
This commit replaces it by a simpler and hopefully clearer check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 14:49:03 +02:00
Michael Niedermayer
d07d54fd56 Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b' 
* commit 'df33a58e5311ee9a64a573889b883a80e981af7b':
  lavf: avoid integer overflow when estimating bitrate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 14:45:53 +02:00
Michael Niedermayer
b0ba2bf8c6 Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303' 
* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
  lavf: move a variable declaration to the block where it's used

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 14:27:48 +02:00
Anton Khirnov
df33a58e53 lavf: avoid integer overflow when estimating bitrate 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-09-02 19:28:29 +02:00
Anton Khirnov
fab694dd39 lavf: move a variable declaration to the block where it's used 2013-09-02 19:28:19 +02:00
Michael Niedermayer
0388203098 avformat/utils: fix duration_fields calculation when need_parsing=0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 00:46:14 +02:00
Michael Niedermayer
c4810fbe4f avformat/utils: fix av_probe_input_buffer2() so it returns the probe score 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 01:15:15 +02:00
Michael Niedermayer
e31db621bf avformat: export probe score 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 22:18:57 +02:00
Michael Niedermayer
a9d1a7c79b avformat: move PROBE_BUF_M* to internal.h 
They will be used by the mp3 probe function in the next commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 00:54:30 +02:00
Alexis Ballier
7a48b1c492 Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-13 04:18:32 +02:00
Reimar Döffinger
d4db7c334b Integrate accessors.h header into internal.h 
I have no idea why I added a separate header,
I think there is no good reason for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-10 07:56:42 +02:00
Reimar Döffinger
a48979d715 Reduce MAKE_ACCESSORS code duplication via a new header. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-08-08 20:32:40 +02:00
Michael Niedermayer
caa7a49481 avformat/utils: fix memleak with nobuffer 
Fixes Ticket2802

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 01:21:43 +02:00
Michael Niedermayer
20be5e0a0e Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' 
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:08:30 +02:00
Diego Biurrun
7950e519bb Disable deprecation warnings for cases where a replacement is available 2013-08-02 19:19:02 +02:00
Michael Niedermayer
f7bc03bcaf Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34' 
* commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34':
  lavf: Don't interpret just slightly broken timestamps as wraparound

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-29 13:14:29 +02:00
Michael Niedermayer
c5b46a064d lavf: Don't interpret just slightly broken timestamps as wraparound 
This avoids breaking some slightly incorrect (dts > pts) timestamps
in sample HLS streams from Apple.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-29 09:49:58 +03:00
Michael Niedermayer
37ecd67b5e Revert "avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716" 
This causes a race condition with VLC. Its plausible that other
applications also would have races with it and its just fixing a memleak when
the user application forgets to free the codec. It causes more
problems than it solves in its current form, thus the revert.
Better solutions are welcome

This reverts commit 0f229f9b91.
 2013-07-21 17:57:15 +02:00
Anshul Maheshwari
0f229f9b91 avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 15:52:50 +02:00
Michael Niedermayer
4f1d3e0212 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: Make sure avg_frame_rate can be calculated without integer overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-16 00:55:07 +02:00
Martin Storsjö
e740929a07 lavf: Make sure avg_frame_rate can be calculated without integer overflow 
If either of the deltas is too large for the multiplications to
succeed, don't use this for setting the avg frame rate.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-15 21:39:24 +03:00
Michael Niedermayer
07206deed1 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Suggest recompilation with openssl or gnutls if the https protocol is not found.
  lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 19:58:19 +02:00
Carl Eugen Hoyos
c9eb5c9751 lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation. 2013-07-10 16:20:40 +02:00
Piotr Bandurski
b050956334 avformat/utils: avformat_find_stream_info set value for ret in case of oom 
without it FFmpeg didn't display any error message when oom event occured

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 16:07:45 +02:00
Piotr Bandurski
ccf9211e29 avformat/utils: avformat_find_stream_info fix a crash in case of oom 
fixes ticket #2767

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 03:42:06 +02:00
Michael Niedermayer
5312c319be avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases 
This fixes speex in rtmp
Fixes Ticket2409

the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration

If this causes any problems, like premature analyze/probe end, please report!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 02:37:24 +02:00
Michael Niedermayer
c7cfd4cce9 avformat_find_stream_info: use fps_dts as last resort to determine duration 
Fixes long delay with some hardware generated h264 in ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-07 15:25:34 +02:00
Michael Niedermayer
8ca5d277d8 avformat/utils: factor ff_find_last_ts() out of ff_gen_search() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-06 22:27:35 +02:00
Michael Niedermayer
d59ec0adbb avformat_find_stream_info: move ret init down from flush codecs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:51 +02:00
Michael Niedermayer
c5ddd75354 avformat_find_stream_info: Do not consider no streams an error in flush codecs 
This should have no functional effect, but allows a cleaner diff when moving it
down

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:51 +02:00
Michael Niedermayer
c826c5698b avformat_find_stream_info: try to preserve the error code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:51 +02:00
Michael Niedermayer
ccba9535dc av_find_stream_info: initialize ret 
This should fix hypothetical corner cases where it might have never been initialized before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 15:07:44 +02:00
Carl Eugen Hoyos
2492f7774f avformat: Print "Consider increasing the value for analzeduration and probesize" even more often 
The sample from ticket #2691 currently does not trigger "Consider increasing
the value for analzeduration and probesize" because the audio streams are
only added after calling estimate_timings(). Attached patch moves the message
below this function call.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 14:08:36 +02:00
Timothy Gu
a9bbf59be7 cosmetics: Fix "dont" "wont" "doesnt" typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 02:31:16 +02:00
wm4
e59fb3f8b1 lavf: silence max_analyze_duration warning 
This is part of normal operation with some formats. A warning should
indicate that something is wrong, and the documentation for AV_LOG_WARNING
says: "Something somehow does not look correct."

Since this message is most likely useful for debugging only, raise the
log level accordingly.

Plus-one-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-26 01:36:27 +02:00
Michael Niedermayer
f8ca8138f0 ff_gen_search: fix infinite loop 
Fixes Ticket2639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 22:53:00 +02:00
Michael Niedermayer
b3dd50cd0d ff_gen_search: fix limit 
The limit value could become slightly wrong in the last iteration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 20:49:37 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Paul B Mahol
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
Luca Barbato
df9f22d42b avf: move url utility functions in a separate file 2013-06-16 15:01:39 +02:00
Luca Barbato
12db891dcd avf: move ff_write_chained to mux.c 2013-06-16 14:41:07 +02:00
Luca Barbato
508998f7d5 avf: move riff tags accessors where they belong 2013-06-16 14:41:07 +02:00
Luca Barbato
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
Luca Barbato
afc8685395 avf: split off format register and lookup function 2013-06-16 14:00:40 +02:00
Paul B Mahol
d5f7f1fef1 audio frame multi-threaded decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Michael Niedermayer
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
Anton Khirnov
c330eba84c lavf: preserve side data when parsing packets. 2013-05-28 08:00:07 +02:00
Dale Curtis
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
Michael Niedermayer
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
Diego Biurrun
2832ea26f3 Remove commented-out debug #define cruft 2013-05-16 00:23:30 +02:00
Michael Niedermayer
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
Diego Biurrun
e0f8be6413 avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate 2013-05-04 21:43:06 +02:00
Michael Niedermayer
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
Nicolas George
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
Nicolas George
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
Michael Niedermayer
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
Diego Biurrun
a5f8873620 silly typo fixes 2013-05-03 18:26:12 +02:00
Paul B Mahol
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
ab2989378f Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756' 
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
	libavformat/utils.c

See: 44a7a6300d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 13:24:33 +02:00
Anton Khirnov
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
Michael Niedermayer
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
Michael Niedermayer
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
Carl Eugen Hoyos
4d3c5d3b65 Do not show "Estimating duration from bitrate" warning if no duration was estimated. 2013-03-30 08:24:51 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Nicolas George
0d09aa9d8e lavf: avformat_seek_file(): validate stream_index. 2013-03-20 13:35:24 +01:00
Michael Niedermayer
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
Michael Niedermayer
07d4f557e5 append_packet_chunked: Remove unused initialization. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-16 17:03:41 +01:00
Michael Niedermayer
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
Anton Khirnov
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
Michael Niedermayer
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
Michael Niedermayer
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
Anton Khirnov
85a5bc054c lavf: remove disabled FF_API_R_FRAME_RATE cruft 2013-03-11 18:23:50 +01:00
Anton Khirnov
7b486ab13b lavf: remove disabled FF_API_AV_GETTIME cruft 2013-03-11 18:23:18 +01:00
Anton Khirnov
435c2a31ad lavf: remove disabled FF_API_READ_PACKET cruft 2013-03-11 18:23:02 +01:00
Anton Khirnov
0a7c4daf46 lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft 2013-03-11 18:22:45 +01:00
Michael Niedermayer
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
Anton Khirnov
1afddbe59e avpacket: use AVBuffer to allow refcounting the packets. 
This will allow us to avoid copying the packets in many cases.

This breaks ABI.
 2013-03-08 07:33:45 +01:00
Reimar Döffinger
efa7f42020 Use the avstring.h locale-independent character type functions 
Make sure the behavior does not change with the locale.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-07 15:16:36 +02:00
Michael Niedermayer
cada996528 avformat: Fix apics with aac 
Fixes Ticket2318

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 13:55:43 +01:00
Michael Niedermayer
7992bdbeb4 update_stream_timings: check bitrate for being in range. 
Fixes numerical overflow
Fixes Ticket2089

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:54:00 +01:00
Michael Niedermayer
faa0068a87 avformat: Make duration estimation from pts more robust 
Ignore durations which differ significantly from the previous
Fixes Ticket2018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:01:32 +01:00
Reimar Döffinger
88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Michael Niedermayer
f2cb993139 avformat: gather aspect ratio from rv30/40 in find_stream_info 
Fixes Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 18:41:16 +01:00
Nicolas George
89f9f69e3f lavf: rescale duration for chained muxers. 
Fix trac ticket #2300 because the duration of the segments
was computed using the timestamp of the last packet plus its
duration using the 1/90000 default time base instead of using
the chained muxer time base.
 2013-02-28 19:20:25 +01:00
Michael Niedermayer
03678a32bc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: Add a fate test for the noproxy pattern matching
  lavf: Handle the environment variable no_proxy more properly

Conflicts:
	libavformat/Makefile
	libavformat/internal.h
	libavformat/tls.c
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-28 13:13:04 +01:00
Michael Niedermayer
1c6477f30f Revert "lavf/utils: add support for special characters encoding in URL" 
This reverts commit 4a8fc1d83b.

The commit caused null pointer derefernces when using udp://
after i fixed that it caused ffmpeg to get stuck and remapped
arguments like ?ttl=255 -> ?ttl%3d255

I dont want to leave this broken thus temporary revert so we all
have some time to look at this without half the network protocols
being broken in the meantime
 2013-02-28 01:29:12 +01:00
Senthilnathan M
4a8fc1d83b lavf/utils: add support for special characters encoding in URL 
In particular, fix trac ticket #2031.

Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-02-28 00:39:17 +01:00
Martin Storsjö
de9cd1b173 lavf: Handle the environment variable no_proxy more properly 
The handling of the environment variable no_proxy, present since
one of the initial commits (de6d9b6404), is inconsistent with
how many other applications and libraries interpret this
variable. Its bare presence does not indicate that the use of
proxies should be skipped, but it is some sort of pattern for
hosts that does not need using a proxy (e.g. for a local network).

As investigated by Rudolf Polzer, different libraries handle this
in different ways, some supporting IP address masks, some supporting
arbitrary globbing using *, some just checking that the pattern matches
the end of the hostname without regard for whether it actually is
the right domain or a domain that ends in the same string.

This simple logic should be pretty similar to the logic used by
lynx and curl.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-02-27 21:32:13 +02:00
Michael Niedermayer
82d79289db avformat: Allocate duration_error separately 
This significantly reduces the memory needed per AVStream when the
array is not needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 23:15:09 +01:00
Michael Niedermayer
6cd650dbd2 ff_gen_search: Fix finding the maximum timestamp in a really small file 
Fixes Assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 20:37:17 +01:00
Michael Niedermayer
695a766bff ff_read_timestamp: check stream_index before using it as array index 
Fixes out of array read

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-18 20:37:17 +01:00
Michael Niedermayer
4a6fa7963b lavf: dont try to find fps for attached pictures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-15 03:19:18 +01:00
Michael Niedermayer
a8e748eee5 lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 21:54:41 +01:00
Stefano Sabatini
176b72a28c lavf/utils: provide feedback in case of invalid probe size 
Log message in case the max_probe_size value in av_probe_input_buffer()
is smaller than the minimum accepted value.
 2013-01-19 00:13:52 +01:00
Carl Eugen Hoyos
a1a707f728 Add a new function av_codec_get_tag2(). 
av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.
 2013-01-17 20:44:33 +01:00
Stefano Sabatini
78e27c44c3 lavf/utils: clarify/extend messages in avformat_find_stream_info() 
In particular, specify the unit of the shown values in case the max probe
size/duration is reached.
 2013-01-13 15:09:09 +01:00
Michael Niedermayer
db1ba2213f lavf: use avpriv_find_pix_fmt instead of ff_ 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 14:09:08 +01:00
Michael Niedermayer
953061ed95 lavf/utils: more complete dts checks 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 00:28:35 +01:00
Michael Niedermayer
2713e43ac8 ff_get_audio_frame_size: try to fix wma in wav 
Fixes Ticket1905, Ticket2114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 19:46:04 +01:00
Carl Eugen Hoyos
c52e07bb6e Fix AVCI50 SPS to specify a SAR of 4:3 instead of 3:4. 2013-01-05 09:20:03 +01:00
Reimar Döffinger
c5142a95a5 Support more AVC-Intra files 
Followup to http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/151321
patch by Reimar and Thomas Mundt fixes some AVC-Intra files from
different tickets.
It does not fix http://samples.ffmpeg.org/ffmpeg-
bugs/trac/ticket524/AVCI50.mov

Authors of this commit are: Reimar and Thomas Mundt
Patch and commit message mostly taken from ffmpeg-devel, mail by Carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-03 21:48:38 +01:00
Michael Niedermayer
bbb11f383e lavf: add return to silence compiler warning 
The added statement is not reachable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-03 20:02:14 +01:00
Clément Bœsch
491ca0e89f Replace references to "que" with the appropriate word. 
"que" sounds like a slang word to me. This commit renames a few
variables, fix the comments and the logging messages (sometimes along
with small other typo fixes).
 2013-01-03 00:21:47 +01:00
Michael Niedermayer
98db905896 avformat_seek_file: Dont attempt to rescale INT64_MIN/MAX 
This fixes a integer overflow in fate

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-03 00:02:22 +01:00
Michael Niedermayer
aa86d2d884 lavf: move stream==-1 handling from ff_subtitles_queue_seek() to avformat_seek_file() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 23:02:33 +01:00
Michael Niedermayer
341e40f1e1 lavf: Fix codec id forcing with probed codecs 
Fixes Ticket2088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 01:17:36 +01:00
Michael Niedermayer
3a6b6f425e lavf: move force_codec_ids() up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 01:17:36 +01:00
Michael Niedermayer
63753186cc lavf: Remove "Adjusting PTS forward" code 
it causes problems (incorrectly detect TS discontinuities)
 with a brokan TS file (test-audio-broken.ts)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-21 05:12:05 +01:00
Michael Niedermayer
1166fc07a2 utils: fix duration calculation for strange_duration_example.ts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-19 04:16:15 +01:00
Michael Niedermayer
1e901ffc61 wrap_timestamp: remove unneeded check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:07:53 +01:00
Michael Niedermayer
1662bd350a lavf: fix integer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:05:36 +01:00
Harald Axmann
2d74dea84f lavf: Provide a monotonic timestamp to the outside world 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 21:28:45 +01:00
Michael Niedermayer
67c1b5b026 lavf: remove unneeded pb check 
Fixes CID747727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 09:34:47 +01:00
Michael Niedermayer
a70b38d2dd lavf: fix memleak 
Fixes CID747738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 08:51:34 +01:00
Michael Niedermayer
20899c54f0 http/utils: rename "demuxer" to mime_type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-10 01:00:16 +01:00
Michael Niedermayer
68bc012190 http/utils: move mime -> demuxer maping from http to utils 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 20:24:49 +01:00
Michael Niedermayer
e3d95b54db probe: belive protocol content type if set and avoid lengthly probing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-09 19:12:34 +01:00
Mans Rullgard
91ac403b13 lavf: fix arithmetic overflows in avformat_seek_file() 
The values compared here can be more than INT64_MAX apart.  Since the
difference is always positive, converting to uint64_t before subtracting
gives the correct result without overflows.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-12-08 19:35:16 +00:00
Michael Niedermayer
99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 13:34:45 +01:00
Anton Khirnov
cb45553f57 Remove pointless #undefs of previously forbidden functions. 2012-12-04 21:40:22 +01:00
Nicolas George
03847eb825 lavf: compute probe buffer size more reliably. 
The previous code computes the offset by reversing the growth
of the allocated buffer size: it is complex and did lead to
inconsistencies when the size limit is reached.

Fix trac ticket #1991.
 2012-12-04 19:49:51 +01:00
Michael Niedermayer
83ddedbbf2 lavf: the core rfps code needs 2 durations to estimate rfps 
This fixes a regression where this count became 1 with
HPM-GC\ EXPORT\ FCP-1A-AVCI100-1080i25-001.mxf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-04 18:04:29 +01:00
Michael Niedermayer
d7b20bfbb5 Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66' 
* commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66':
  lavf: move nuv fourcc audio tags from riff to nuv
  lavf: add a common function for selecting a pcm codec from parameters

Conflicts:
	libavformat/internal.h
	libavformat/mov.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:00:44 +01:00
Justin Ruggles
261e9348ef lavf: add a common function for selecting a pcm codec from parameters 2012-11-28 11:18:50 -05:00
Michael Niedermayer
386fc67c79 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: avoid integer overflow in ff_compute_frame_duration()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-26 16:24:23 +01:00
Janne Grunau
7709ce029a lavf: avoid integer overflow in ff_compute_frame_duration() 
Scaling the denominator instead of the numerator if it is too large
loses precision. Fixes an assert caused by a negative frame duration in
the fuzzed sample nasa-8s2.ts_s202310.

CC: libav-stable@libav.org
 2012-11-26 10:26:08 +01:00
Michael Niedermayer
0efcf16a3e replace av_log(0, by av_log(NULL, 
The first parameter is a pointer and NULL is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-23 18:10:02 +01:00
Carl Eugen Hoyos
d513fb1c75 Add -skip_initial_bytes option. 
Fixes ticket #1909.
 2012-11-20 22:04:14 +01:00
Gavin Kinsey
19660a8876 Allow use of @ character in username and passwords embedded in URLs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 18:02:28 +01:00
Marton Balint
4bee03034b lavf: let av_find_best_stream use bitrate info if available 
I guess the user expects to see the stream with the highest bitrate, not with
the most frames, this is especially useful for multi bitrate streams.

This patch changes av_find_best_stream to select the stream based on a number
of conditions, the first condition has the highest priority, the last condition
has the lowest:

1) Select the stream with the highest FFMIN(5, codec_info_nb_frames) value
2) Select the stream with the highest bitrate
3) Select the stream with the highest codec_info_nb_frames
4) Select the first stream

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:57:08 +01:00
Michael Niedermayer
af9ec3dd1d av_probe_input_format3: support NULL as buffer. Fixes null ptr deref 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-13 22:21:10 +01:00
Michael Niedermayer
7ec1fe1f47 lavf: Dont compare absolute to relative timestamps in duration gcd 
This prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-09 14:59:43 +01:00
Michael Niedermayer
2ca649f177 utils: fix integer overflow with DURATION_MAX_READ_SIZE 
Fixes CID703746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-06 18:44:14 +01:00
Michael Niedermayer
f742c7b2ce lavf: fix integer overflow in rfps calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-01 21:37:29 +01:00
Michael Niedermayer
6992b0bfc2 utils: fix rounding of micro seconds 
Found-by: Johan Wessfeldt <johan.wessfeldt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-31 19:12:47 +01:00
Paul B Mahol
e12cfd044c lavf: const correctness for avformat_new_stream 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-24 17:55:35 +00:00
Michael Niedermayer
5442c6cce3 lavf: fix duration estimation for multi program TS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 18:11:26 +02:00
Michael Niedermayer
31cdf6002a lavf: increase retries to guess duration from pts by 1 
This fixes finding the duration for one TS file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-23 17:31:31 +02:00