virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity
42,949 Commits 37 Branches 400 Tags
Commit Graph

42949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jamal
94c3e11a6f imgutils: Fix warnings about incompatible pointer type and discarded qualifiers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 22:10:10 +02:00
Carl Eugen Hoyos
4f2549e3d0 Fix aiff demuxer dependencies. 2012-07-27 20:42:35 +02:00
jamal
52a62f9085 dwt: Fix several warnings about incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 19:36:17 +02:00
Steven Robertson
b3841db133 vf_alphamerge: Fix reversed conditional 
Reviewed-by: Nicolas George
 2012-07-27 14:00:04 +02:00
Matthieu Bouron
789f8cb03a avutil: support 50 and 60 frame rates in timecode api 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 13:41:58 +02:00
Marton Balint
3be02afb56 mxfdec: fix off by one error in d10 aes3 decoding 
Without this fix the last sample was missing from the packet.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 13:36:43 +02:00
jamal
c49e0d2cdd aviobuf: Fix warning about discarded qualifier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 12:46:51 +02:00
Michael Niedermayer
a2cd13f04f zmbv: Fix warning about discarded qualifier 
Based on patch by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 12:43:15 +02:00
jamal
cb40d36074 ffv1: Fix warnings about incompatible pointer type and discarded qualifiers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-27 12:27:21 +02:00
Michael Niedermayer
236ecc3502 fate: change fate-suite rsync server. 
there are some technical problems with fate.ffmpeg.org
thus split the subdomain between fate-suite and fate
fate-suite is now (temporary) provided by our main server

until fate-suite.ffmpeg.org is setup to point somewhere
we use fate-suite.avcodec.org

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 23:07:53 +02:00
Clément Bœsch
316f8db2c2 SubViewer demuxer and decoder. 2012-07-26 22:22:54 +02:00
Clément Bœsch
2755abff3e lavc/rt: small wording fix in a comment. 2012-07-26 22:22:49 +02:00
Michael Niedermayer
7333798c85 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libopenjpeg: support YUV and deep RGB pixel formats
  Fix typo in v410 decoder.
  vf_yadif: unset cur_buf on the input link.
  vf_overlay: ensure the overlay frame does not get leaked.
  vf_overlay: prevent premature freeing of cur_buf
  Support urlencoded http authentication credentials
  rtmp: Return an error when the client bandwidth is incorrect
  rtmp: Return proper error code in handle_server_bw
  rtmp: Return proper error code in handle_client_bw
  rtmp: Return proper error codes in handle_chunk_size
  lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt()
  vp8: Replace x*155/100 by x*101581>>16.
  vp3: don't use calls to inline asm in yasm code.
  x86/dsputil: put inline asm under HAVE_INLINE_ASM.
  dsputil_mmx: fix incorrect assembly code
  rtmp: Factorize the code by adding handle_invoke
  rtmp: Factorize the code by adding handle_chunk_size
  rtmp: Factorize the code by adding handle_ping
  rtmp: Factorize the code by adding handle_client_bw
  rtmp: Factorize the code by adding handle_server_bw

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/x86/dsputil_mmx.c
	libavfilter/vf_overlay.c
	libavformat/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 21:37:15 +02:00
Michael Niedermayer
307a20cca2 Changelog: put entries lost in 2cb4d516549526b5e17e941f6d2375a2c501ade6 back 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 20:37:05 +02:00
Michael Niedermayer
f5a5b4344b ffmpeg: doxyfy some comments and mention the timebase used in various timestamp fields. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:58:26 +02:00
Michael Niedermayer
1a7af514de ffmpeg: move decoded_frame->pts computation together 
This clarifies the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:57:36 +02:00
Michael Niedermayer
c76a5365bb ffmpeg: Fix rounding errors in decoded_frame->pts computation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:56:52 +02:00
Michael Niedermayer
9b1fdb1c5a ffmpeg: fix assumed decoded_frame->pts timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:56:07 +02:00
Michael Niedermayer
b616405c16 ffmpeg: reset decoded_frame->pts after rescaling. 
This ensures its not used afterwards.
This commit should not change anything as it should not have been used afterwards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:51:56 +02:00
Michael Niedermayer
e15e5328a7 mpc8: Initialize AVFrame properly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:45:44 +02:00
Michael Niedermayer
5938b4d398 mpc7: Initialize AVFrame properly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:42:42 +02:00
Michael Niedermayer
55fa883b30 ffmpeg: fix units of next_?ts in debug printing routine. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 17:12:07 +02:00
Michael Niedermayer
506ffa793f h264_cabac: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 16:33:39 +02:00
Michael Niedermayer
7a4e30f3b6 h264_cabac: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 16:33:17 +02:00
Michael Bradshaw
44dc9c6af0 libopenjpeg: support YUV and deep RGB pixel formats 
Based on FFmpeg version from
commit 3275981207e30e140cffaea334ac390f1a04266a

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-26 10:20:04 +02:00
Carl Eugen Hoyos
92566540c3 Fix typo in v410 decoder. 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-07-26 10:08:49 +02:00
William Yu
d5d5e3dabe lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts 2012-07-26 10:05:58 +02:00
Michael Niedermayer
97c0d5357d omadec: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:30:35 +02:00
Michael Niedermayer
9c83f3e659 loasdec: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:30:20 +02:00
Michael Niedermayer
e083a62e9d aacdec: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:29:59 +02:00
Michael Niedermayer
6f6182372c hls: replace probsize=0 by noheader flag removial. 
This fixes h264 timestamps in hls
Fixes ticket1572

Tested-by: crtmpserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:05:31 +02:00
Michael Niedermayer
12d1ee6a5e ff_add_index_entry: reject AV_NOPTS_VALUE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 03:05:31 +02:00
Michael Niedermayer
2cd491a47c lavf: move generic index generation code to a later point 
By moving it to a later point relative and unknown timestamps
are more likely to have been corrected

similar patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	libavformat/utils.c
 2012-07-26 03:04:49 +02:00
Michael Niedermayer
2880c31660 parse_packet: use pkt.pos always instead of the avparser offset. 
This is more correct and will be needed when the code is moved to
a later point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:20:59 +02:00
Michael Niedermayer
4e7f9ebdc2 wav: switch to AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:12:56 +02:00
Michael Niedermayer
fdc371114f ff_raw_audio_read_header: mark as AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:11:21 +02:00
Michael Niedermayer
5ea4ee7bcb flacdec: mark as AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:03:58 +02:00
Michael Niedermayer
ea8c12c90f mp3dec: mark as AVSTREAM_PARSE_FULL_RAW 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 02:03:56 +02:00
Piotr Bandurski
c5f23df2dd movenc: fix remuxing of yuv2 
Attached patch fixes remuxing of yuv2 in mov (and does not break remuxing of yuvs)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 01:37:46 +02:00
Michael Niedermayer
9054f6b66b probe_codec: fix memory corruption 
Found-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-26 01:10:55 +02:00
Nicolas George
6bf87785e8 ffmpeg: warn about new streams after startup. 2012-07-26 00:30:38 +02:00
Nicolas George
d0d9272580 faq: explain about new streams, probesize and analyzeduration. 2012-07-26 00:30:37 +02:00
Anton Khirnov
b5c8aa745e vf_yadif: unset cur_buf on the input link. 
The buffer is stored internally, so this prevents it from being unreffed
automatically.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-26 00:01:04 +02:00
Anton Khirnov
f431315a86 vf_overlay: ensure the overlay frame does not get leaked. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-26 00:01:04 +02:00
Michael Niedermayer
08fc1ad151 vf_overlay: prevent premature freeing of cur_buf 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-26 00:01:04 +02:00
Antti Seppälä
5423e908c9 Support urlencoded http authentication credentials 
It should be possible to specify usernames in http requests containing
urlencoded characters. This patch adds support for decoding the auth
strings.

Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-26 00:18:32 +03:00
Samuel Pitoiset
abf77a247b rtmp: Return an error when the client bandwidth is incorrect 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 23:57:01 +03:00
Samuel Pitoiset
be8f949219 rtmp: Return proper error code in handle_server_bw 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 23:57:00 +03:00
Samuel Pitoiset
088a82bb33 rtmp: Return proper error code in handle_client_bw 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 23:57:00 +03:00
Samuel Pitoiset
e7ea6883bf rtmp: Return proper error codes in handle_chunk_size 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 23:57:00 +03:00