virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
28,997 Commits 37 Branches 400 Tags 464 MiB
9abd87bbc6
Commit Graph

28997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c88caa522c Merge remote branch 'qatar/master' 
* qatar/master:
  proto: include os_support.h in network.h
  matroskaenc: don't write an empty Cues element.
  lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
  avio: move extern url_interrupt_cb declaration from avio.h to url.h
  avio: make av_register_protocol2 internal.
  avio: avio_ prefix for url_set_interrupt_cb.
  avio: AVIO_ prefixes for URL_ open flags.
  proto: introduce listen option in tcp
  doc: clarify configure features
  proto: factor ff_network_wait_fd and use it on udp

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 02:50:13 +02:00
Michael Niedermayer
db95e559f2 fix another forgotten mplayerhq.hu link 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 01:35:43 +02:00
Michael Niedermayer
610b963e82 Fix link to ffmpeg-devel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 00:20:18 +02:00
Michael Niedermayer
ffb61814a0 Fix deblocking with thread_slices 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 00:20:18 +02:00
Michael Niedermayer
f6d71b3942 ffplay: Set EMU_EDGE if dr1, this is an alternative fix for ticket40. 
Idea borrowed from mplayer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-08 00:20:18 +02:00
Luca Barbato
a2031251c7 proto: include os_support.h in network.h 
Fix compilation on systems without poll()
 2011-04-07 21:03:12 +02:00
Anton Khirnov
9181976348 matroskaenc: don't write an empty Cues element. 2011-04-07 18:11:24 +02:00
Anton Khirnov
9f5ddd1e46 lavc: add a FF_API_REQUEST_CHANNELS deprecation macro 
And hide request_channels AVOption under it.
 2011-04-07 18:11:24 +02:00
Anton Khirnov
5cec897105 avio: move extern url_interrupt_cb declaration from avio.h to url.h 2011-04-07 18:11:24 +02:00
Anton Khirnov
8e76a19b63 avio: make av_register_protocol2 internal. 2011-04-07 18:11:24 +02:00
Anton Khirnov
80c6e238b0 avio: avio_ prefix for url_set_interrupt_cb. 2011-04-07 18:11:24 +02:00
Anton Khirnov
f87b1b373a avio: AVIO_ prefixes for URL_ open flags. 2011-04-07 18:07:16 +02:00
Peter Ross
de174d0d25 riff: add ATRAC3+ guid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Peter Ross
aa9380c89c ff_get_wav_header: perform full lookup on WAVEFORMATEXTENSIBLE subformat guid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Peter Ross
36ffabc4ee move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Peter Ross
c1309b27d2 move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Alexis Ballier
dc41036105 Install libavutil/{aes,sha}.h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 17:54:52 +02:00
Stefano Sabatini
4f29941194 pad: fix example explanation 
"row" and "column" term positions in the explanation were inverted.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-07 17:45:31 +02:00
Michael Niedermayer
c0e51ec9c6 Merge remote branch 'qatar/master' 
* qatar/master:
  Fix parser: mark av_parser_parse() for removal on next major bump
  swscale: postpone sws_getContext removal until next major bump.
  fate: add AAC LATM test
  mmst: get rid of deprecated AVERRORs
  lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM.
  Reemove remaining uses of deprecated AVERROR_NOTSUPP.
REIMPLEMENTED in 2 lines of code:  lavf: if id3v2 tag is present and all else fails, guess by file extension

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 03:32:26 +02:00
Luca Barbato
3d42d4937b proto: introduce listen option in tcp 
This way is possible to have simple micro-server act like

ffmpeg -i file.nut -vcodec copy -acodec copy -f nut tcp://foo:1234?listen
 2011-04-07 02:54:30 +02:00
Luca Barbato
a013291d26 doc: clarify configure features 
This way people will not get surprises regarding the current configure
behaviour and contributors will have a guideline on what is expected.
 2011-04-07 02:54:12 +02:00
Luca Barbato
ebba2b3e2a proto: factor ff_network_wait_fd and use it on udp 
Support the URL_FLAG_NONBLOCK semantic and uniform the protocol.
The quick retry loop is already part of retry_transfer_wrapper.

The polling routine is common to the network protocols:
udp, tcp and, once merged, sctp.
 2011-04-07 02:53:55 +02:00
Michael Niedermayer
4b9c03b7f0 Align stack variables manually in yadif x86 code, should fix ticket25 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 01:49:06 +02:00
Michael Niedermayer
9f8008a981 move image check down in ffplay.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-07 01:48:47 +02:00
Michael Niedermayer
454fab721a Disable dr1 in ffplay for svq1 (fixes ticket40) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 23:46:37 +02:00
Brad
1f6265e011 Fix parser: mark av_parser_parse() for removal on next major bump 
Fix the breakage introduced with 9073ca6c6e
 2011-04-06 23:45:34 +02:00
Michael Niedermayer
8bce71dff5 Check sizes a bit in ffplay, cant hurt. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 23:39:57 +02:00
Michael Niedermayer
326dff7d05 Fix ticket34 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 23:21:44 +02:00
Michael Niedermayer
bc6047223f Drop checkheaders from check, its useless 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 23:21:44 +02:00
Michael Niedermayer
6b1c886b65 Fix ticket20 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 23:21:44 +02:00
Anton Khirnov
0464ee9af2 swscale: postpone sws_getContext removal until next major bump. 
The replacement isn't ready yet.
 2011-04-06 22:55:28 +02:00
Janne Grunau
0ba832231d fate: add AAC LATM test 2011-04-06 20:55:58 +02:00
Reimar Döffinger
1265395b5b Add PlayStation Portable PMP format demuxer 
Not yet complete, for demuxing AAC the AAC header must be generated
manually.
Possibly the decoder could accept the header as extradata to simplify
this.
 2011-04-06 19:30:42 +02:00
Anton Khirnov
6e37b45888 mmst: get rid of deprecated AVERRORs 2011-04-06 14:10:08 +02:00
Anton Khirnov
a2018b5167 lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. 2011-04-06 14:10:08 +02:00
Anton Khirnov
f5b386afab Reemove remaining uses of deprecated AVERROR_NOTSUPP. 2011-04-06 14:10:08 +02:00
Anton Khirnov
56a1000917 lavf: if id3v2 tag is present and all else fails, guess by file extension 2011-04-06 14:10:08 +02:00
Michael Niedermayer
d6c858658f Revert "ffmpeg: fix aspect ratio setting" 
This reverts commit d1eb50bb29.
Reason, it breaks fate
 2011-04-06 03:01:25 +02:00
Michael Niedermayer
11d78415ca Merge remote branch 'qatar/master' 
* qatar/master:
  psymodel: extend API to include PE and bit allocation.
  avio: always compile dyn_buf functions
  Remove unnecessary parameter from ff_thread_init() and fix behavior
  Revert "aac_latm_dec: use aac context and aac m4ac"
  configure: tell user if libva is enabled like the rest of external libs.
  Add silence support for AV_SAMPLE_FMT_U8.
  avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
  avio: deprecate av_url_read_seek
  avio: deprecate av_url_read_pause
  ac3enc: NEON optimised extract_exponents

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 02:59:49 +02:00
Michael Niedermayer
ee6db0de37 Fix ffmpeg-mt fixme in h264. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Michael Niedermayer
98fe404a94 Fix REBASE_PICTURE with h.264 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Michael Niedermayer
b5ef6f8eb4 Fix crash in ffmpeg.c with PIX_FMT_NONE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Michael Niedermayer
0c72180ea6 Revert "Set the correct target for mingw64 dlltool" 
Revert due to dlltool/lib revert
This reverts commit 417516f63f.
 2011-04-06 01:09:04 +02:00
Michael Niedermayer
1f3a1fa921 Fix gazeta-20090408-1456-aa.ts 
regression introduced by 15957b197a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Michael Niedermayer
b1eeddf1cc Fix Ticket37 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-06 01:09:04 +02:00
Nathan Caldwell
5371803dd5 psymodel: extend API to include PE and bit allocation. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-04-05 22:21:04 +02:00
Anton Khirnov
668438a31e avio: always compile dyn_buf functions 
Fixes build with --disable-muxers --disable-network.

Thanks to Hendrik Leppkes for noticing.
 2011-04-05 19:32:14 +02:00
Reimar Döffinger
da53f05fd0 Do not offer unsupported HWAccel PIX_FMT. 
Only fixes MPEG-1/MPEG-2 as a first step.
 2011-04-05 18:23:15 +02:00
Reimar Döffinger
735c4f0b84 Use CONFIG_VDPAU as condition for using ff_vdpau_mpeg_picture_complete. 
CONFIG_VDPAU is the condition on which ff_vdpau_mpeg_picture_complete
is compiled in, so it is more appropriate, particularly since the
separate VDPAU decoder should be removed in the longer term.
 2011-04-05 18:23:10 +02:00
Reimar Döffinger
6e075dcaf8 ac3dec: avoid pointless alloc and indirection for input_buffer 
Since we now always allocate it, it can simply be made part of the context
instead.
 2011-04-05 18:21:51 +02:00