ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 13:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,144 Commits 36 Branches 398 Tags 544 MiB
aa5b93fbd8
Commit Graph

43144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronald S. Bultje
bde73f28af mpegaudio: bury inline asm under HAVE_INLINE_ASM. 2012-07-26 13:43:16 -07:00
Ronald S. Bultje
30b45d9c38 x86inc: automatically insert vzeroupper for YMM functions. 2012-07-26 13:43:16 -07: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
Samuel Pitoiset
8ea1459bc3 rtmp: Check the buffer length of ping packets 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-26 22:57:15 +03:00
Samuel Pitoiset
e49e6b6451 rtmp: Allow having more unknown data at the end of a chunk size packet without failing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-26 22:56:54 +03:00
Samuel Pitoiset
2357f60687 rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-26 22:56:54 +03: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 2cb4d51654 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 3275981207

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
Michael Niedermayer
f7d4e26c6a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: Add a new option 'rtmp_pageurl'
  doc: Update the description of the rtmp_tcurl option
  rtmp: Make the description of the rtmp_tcurl option more generic
  libfdk-aacenc: add LATM/LOAS encapsulation support
  sctp: add port missing error message
  tcp: add port missing error message
  avfilter: Fix printf format string conversion specifier

Conflicts:
	libavcodec/version.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 22:00:06 +02:00
Justin Ruggles
0dadf9d1e9 lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt() 2012-07-25 15:41:25 -04:00
Michael Niedermayer
9746f87f15 libvpxenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 21:35:48 +02:00
Michael Niedermayer
aee675a326 intrax8: asserts cleanup 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-25 21:35:30 +02:00
Ronald S. Bultje
48098788c2 vp8: Replace x*155/100 by x*101581>>16. 
Idea stolen from webp (by Pascal Massimino) - because it's Cool.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-25 14:37:03 -04:00