ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-17 20:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,812 Commits 37 Branches 400 Tags 505 MiB
48a7981e6f
Commit Graph

48812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
48a7981e6f doc/examples: fix assignments in if() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 05:05:20 +01:00
Michael Niedermayer
aaa7d2fafc h264: don t leave stale pointers in delayed_pic in flush_changes. 
Fixes null pointer dereference & assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 03:03:53 +01:00
Michael Niedermayer
55d0528669 swr/dither: fix division by 0 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 02:57:00 +01:00
Michael Niedermayer
c13e4e288c h264: fix () placement 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 00:09:01 +01:00
Michael Niedermayer
2d8d63a9a0 ffplay: fix sws_flags 
Fixes Ticket45

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 22:48:28 +01:00
Michael Niedermayer
d676598f87 swr: fix handling of timestamps that cause multiple drops or silence injections 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 18:39:06 +01:00
Michael Niedermayer
a34aee4646 swr: limit buffer size for silence injection 
This reduces memory usage for unreasonable large silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 16:04:41 +01:00
Michael Niedermayer
b481d09bd9 swr: limit buffer size for discarding. 
This prevents insane memory usage in case of insane input values.
Untested due to lack of a testcase that causes such insane allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 16:04:41 +01:00
Stefano Sabatini
e8bab4c6fc ffplay: extend documentation for the -vf option 
In particular, make it consistent with the ffmpeg docs.
 2013-01-13 16:03:13 +01:00
Michael Niedermayer
db4e0ecaf0 swr: move silence buffer to context to avoid per use malloc/free 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 15:28:00 +01:00
Michael Niedermayer
dc6588421e swr: move buffer used to discard sample to context 
This avoids the need to allocate & free to repeatly

Fixes Ticket2122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 15:28:00 +01:00
Stefano Sabatini
98247e3368 lavf: clarify/extend documentation for AVFormatContext::analyzeduration 
"analyzeduration" is not used to detect the input duration, but to
specify the max probe data duration. Fix option description and related
doc entry accordingly.
 2013-01-13 15:09:09 +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
Stefano Sabatini
89ef586867 doc/ffmpeg: extend documentation for the -filter options and -af/vf aliases 2013-01-13 15:09:09 +01:00
Stefano Sabatini
c499d45c6b doc/texipod: add rule to correctly interpret @ref{ANCHOR,XREF,SECTION_NAME,...} 
This allows to name an internal reference in the POD/MAN output.
 2013-01-13 15:09:08 +01:00
Paul B Mahol
5b9126ba84 lavfi/gradfun: support YUV440P 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-13 13:23:30 +00:00
Michael Niedermayer
3bcf443f91 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Send a valid "delay since SR" value in the RTCP RR packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 14:06:01 +01:00
Michael Niedermayer
6cd1dbe6df Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5' 
* commit 'e568db40258d549777ac1c16971678e18a18f5f5':
  rtpdec: Calculate and report packet reception jitter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 14:00:12 +01:00
Michael Niedermayer
6d6eb7c12c Merge commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8' 
* commit 'abae27ed3acd0a7c54f11760c5be2d2653c4edf8':
  rtpdec: Fix the calculation of expected number of packets
  fate: vp3: Fix fate-vp3-coeff-level64 test dependencies

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 13:54:52 +01:00
Michael Niedermayer
841a288cb3 Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69' 
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
  fate: cosmetics: Order some test entries

Conflicts:
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 13:42:10 +01:00
Michael Niedermayer
a6e4796fbf pthread: Do not use a half updated context as master for deallocation. 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 06:22:04 +01:00
Michael Niedermayer
2ea3f37d5f dvdsubenc: use unsigned shifts to avoid shifting into the sign bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 21:45:03 +01:00
Michael Niedermayer
754dd7e889 dvdsubdec: use unsigned shifts to avoid shifting into the sign bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 21:39:00 +01:00
Michael Niedermayer
c8737d348b swr: work with 4 noise shaping coeffs at a time 
63->38 kcycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 19:17:08 +01:00
Michael Niedermayer
93bc0f0180 swr/noise_shaping_data: pad coeffs to multiple of 4 when they are 1 below 
This allows using code working with 4 at a time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 19:09:54 +01:00
Martin Storsjö
22c436c85e rtpdec: Send a valid "delay since SR" value in the RTCP RR packets 
Previously, we always signalled a zero time since the last RTCP
SR, which is dubious.

The code also suggested that this would be the difference in
RTP NTP time units (32.32 fixed point), while it actually is
in in 1/65536 second units. (RFC 3550 section 6.4.1)

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 19:55:49 +02:00
Martin Storsjö
e568db4025 rtpdec: Calculate and report packet reception jitter 
This brings back some code that was added originally in 4a6cc061
but never was used, and was removed as unused in 4cc843fa. The
code is updated to actually work and is tested to return sane
values.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 19:53:53 +02:00
Martin Storsjö
abae27ed3a rtpdec: Fix the calculation of expected number of packets 
The base_seq variable is set to first_seq - 1 (in
rtp_init_sequence), so no + 1 is needed here.

This avoids reporting 1 lost packet from the start.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-12 19:48:41 +02:00
Michael Niedermayer
1c14c3412e dec/developer: Add Valgrind / Address Sanitizer to the patch checklist 
Reviewed-by: saste
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 18:23:32 +01:00
Michael Niedermayer
ef7fdc8cff swr: use a local variable for ns_coeffs 
maybe a very tiny bit faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 17:43:29 +01:00
Michael Niedermayer
68ff7d265f swr: use local variable for ns_errors 
71 -> 63 kcycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 17:43:29 +01:00
Michael Niedermayer
b5d9e5d06c swr: minor simplification for the noise shaping pos update 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 17:43:29 +01:00
Matthieu Bouron
f9eed5d7e6 lavfi/aevalsrc: try to honor specified duration 
If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc
should generate the exact amount of samples according to duration.

Example:
aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-01-12 17:26:35 +01:00
Diego Biurrun
4d3b144c5e fate: cosmetics: Order some test entries 2013-01-12 17:19:27 +01:00
Diego Biurrun
0f94c0b1b6 fate: vp3: Fix fate-vp3-coeff-level64 test dependencies 
Also rename the test to reflect that the video track is Theora, not VP3.
 2013-01-12 17:19:27 +01:00
Paul B Mahol
868ac91c8d frmdec: do not abuse ff_codec_get_id() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-12 14:39:13 +00: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
43d6ac53f2 lavc: ff_find_pix_fmt ->avpriv 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 14:06:30 +01:00
Michael Niedermayer
dae382b5b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU.
  pixfmt: add picture format for VDPAU

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:42:42 +01:00
Michael Niedermayer
15daa8f9dd Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6' 
* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:32:13 +01:00
Michael Niedermayer
e730c3a2cb Merge commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1' 
* commit '54cb096ee4558b3bfc28c2fcd6418ce82dc39fe1':
  rtsp: Remove an outdated comment
  rtsp: Remove references to weirdly named variables in other files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:14:05 +01:00
Michael Niedermayer
dda2d29748 Merge commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457' 
* commit 'c44784c9bb9d0ddf5d39d0dfa640816a57b8f457':
  rtp: Rename a static variable to normal naming conventions
  rtp: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 13:00:50 +01:00
Diego Biurrun
f89466ad6f Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU. 
Also fix a lavu version typo in APIchanges.
 2013-01-12 12:28:12 +01:00
Luca Barbato
f61272f0ef ratecontrol: K&R cosmetic formatting 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-12 12:00:49 +01:00
Rémi Denis-Courmont
169fb94f0f pixfmt: add picture format for VDPAU 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-12 12:00:49 +01:00
Stefano Sabatini
4a0d1b2159 doc/protocols: improve wording of a sentence in http docs 
Suggested-By: Alexander Strasser
 2013-01-12 11:02:12 +01:00
Stefano Sabatini
0edb440282 doc/ffserver: remove painfully outdated "What do I need?" section 2013-01-12 10:53:22 +01:00
Stefano Sabatini
df018207f9 doc/ffserver: remove paragraph in the introductory blurb 
The paragraph is about what ffserver is not and where to look for other
information, but is pretty redundant and distracting, especially
considering the new organization of the documentation.
 2013-01-12 10:52:32 +01:00
Stefano Sabatini
cab85051c0 doc/ffserver: rework introducing paragraphs of the "description" chapter 
In particular, add some markup, fix empty line, and merge it with "How
does it work?" section.
 2013-01-12 10:49:11 +01:00
Stefano Sabatini
0a7cd74043 doc/protocols: document http protocol options 2013-01-12 10:41:56 +01:00