virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
57,252 Commits 37 Branches 400 Tags 465 MiB
2a5f4c1ea2
Commit Graph

57252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
2a5f4c1ea2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wtv: Seek by sector properly

Conflicts:
	libavformat/wtvdec.c

See: a0d13d84a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 11:11:34 +02:00
Michael Niedermayer
5d2a83571b avformat/wtv: rename to wtv_common 
This helps git matchup files on merges correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 10:58:17 +02:00
Michael Niedermayer
12e66f2056 MAINTAINERS: add Timothy to documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 00:49:54 +02:00
俞晓磊
4bfdd021c7 configure: remove \r from cc_ident, 
This should fix cygwin + non-cygwin toolchain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 00:15:33 +02:00
Lukasz Marek
f569592623 lavd/pulse_audio_enc: fix error check 
Error check should be done by checking negative value, not non-zero.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-18 23:59:27 +02:00
Stefano Sabatini
f6b56b1f26 lavd/fbdev: use av_str2err() macro for printing error messages 
In particular fix wrong strerror(ret) with a negative value, and avoid
the use of non thread-safe strerror().
 2013-10-18 23:38:54 +02:00
Lukasz Marek
fb74c7e044 lavd/pulse_audio_dec: apply cosmetic changes 
In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-18 23:26:55 +02:00
Lukasz Marek
1421ee2637 lavd/fbdev: pass proper memory map length 
fbdev->data was allocated with size fbdev->fixinfo.smem_len, release data
in fbdev_read_close() using the same size.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-18 23:23:23 +02:00
Stefano Sabatini
8efed29937 MAINTAINERS: add my name to a few entries 2013-10-18 23:02:34 +02:00
Carl Eugen Hoyos
9860fb445a Fix decoding of G.726 in AIFF. 
Fixes ticket #1973.
 2013-10-18 19:53:47 +02:00
Carl Eugen Hoyos
6e65e34837 lavf/riff: Fix a comment. 
FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.
 2013-10-18 19:35:03 +02:00
Carl Eugen Hoyos
640c70ddc2 avformat: Use G726LE decoder for Sun AU files 
fixes ticket #1955 as suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-18 16:46:08 +02:00
Carl Eugen Hoyos
10c240a085 avcodec: Add little-endian G726 decoder 
Fixes part of Ticket1955
suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-18 16:46:08 +02:00
Carl Eugen Hoyos
5b9f39860d Support 4k AVC-Intra in mov. 2013-10-18 15:41:34 +02:00
Luca Barbato
2b72f8ac32 wtv: Seek by sector properly 
Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.

Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.
 2013-10-18 15:08:18 +02:00
Paul B Mahol
a688176535 avformat/flvdec: use avpriv_request_sample() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-18 09:55:16 +00:00
Clément Bœsch
0bf8580354 avcodec/hevcpred: fix make checkheaders. 2013-10-17 21:35:40 +02:00
Michael Niedermayer
57c018d542 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: Increase the tolerance in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 20:15:22 +02:00
Michael Niedermayer
123c6ca809 Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92' 
* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 19:51:12 +02:00
Stefano Sabatini
904c89ac1b lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 
Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.
 2013-10-17 18:09:54 +02:00
Martin Storsjö
a27f1116cd fate: Increase the tolerance in the lavr tests 
A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-17 19:09:50 +03:00
Stefano Sabatini
8696e51baf lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions 
The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().
 2013-10-17 18:09:29 +02:00
Stefano Sabatini
d96e377c39 lavu/channel_layout: change av_get_channel_layout() behavior at the next bump 
The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.

With the new parser the string:
1234

is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.

ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.

The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.
 2013-10-17 18:03:09 +02:00
Stefano Sabatini
b236eb49e1 lavu/opt.h: fix grammar typo in av_opt_get* doxy 2013-10-17 18:03:03 +02:00
Stefano Sabatini
98e7c1eed5 lavu/opt-test: use automatic set and free handlers 
In particular, do not set default string value by hand and use
av_opt_free() to free context.
 2013-10-17 18:02:54 +02:00
Michael Niedermayer
d0a3bc1302 swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 14:02:43 +02:00
Michael Niedermayer
2db6547237 swscale/utils/sws_setColorspaceDetails(): fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 14:02:43 +02:00
Diego Biurrun
f52fd3f3b2 fate: aac: Add test for AAC-LD 2013-10-17 12:36:35 +02:00
Michael Niedermayer
f90eb8cfc8 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 10:42:41 +02:00
Dirk Farin
56cf6151ae avformat/hevcdec: add more irap cases to hevc_probe() 
This fixes fate-hevc-conformance-RAP_A_docomo_4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 10:18:28 +02:00
Dirk Farin
2ac31773f3 avformat/hevcdec: cosmetics, whitespaces 
This reduces the difference to the latest hevc demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 10:14:11 +02:00
Carl Eugen Hoyos
a0d13d84a9 Add some necessary casts in the wtv demuxer. 
This reverts e8023dba, fixes ticket #3049.
 2013-10-17 09:54:03 +02:00
Michael Niedermayer
21b3563dcb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mem: Make av_strdup allocate using av_realloc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 08:13:42 +02:00
Mickaël Raulet
a7e300649a hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 02:42:11 +02:00
Mickaël Raulet
b494894390 hevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e446bfa2b27f55e) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 02:41:51 +02:00
Michael Niedermayer
3ed65d98c6 avutil/log: fix race between setting and using the log callback 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 00:49:55 +02:00
Michael Niedermayer
9a63a45e48 doc/utils: fix docs build 
Not sure this is the correct solution but that can be investigated too once
the docs build again

Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 22:32:47 +02:00
Paul B Mahol
37d6b2b4e6 swsscale/swscale_unscaled: add GBRAP16 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 20:44:12 +02:00
Michael Niedermayer
9ec9d46365 swscale/swscale_unscaled: fix alpha pointer & stride for planarRgb16ToRgb16Wrapper() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 20:44:12 +02:00
Timothy Gu
586b8ea248 doc/filters: reference ffmpeg-utils manual for color and sizes options 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu
155a5ff00d doc/utils: reformat doc for color syntax and add list of supported colors 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu
b4da1fa550 doc/utils: rewrite doc for time duration syntax 
Extend description and clarify syntax.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Martin Storsjö
d433e1aefa mem: Make av_strdup allocate using av_realloc 
This makes sure that pointers from av_strdup are reallocable,
which is used in av_dict_set if the AV_DICT_APPEND flag is set.

Nothing should rely on pointers from av_strdup being aligned.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-16 18:59:01 +03:00
Carl Eugen Hoyos
d0b7d24b80 Support HEVC in transport streams. 2013-10-16 17:54:37 +02:00
Ronald S. Bultje
734ccf3785 avcodec/vp9: fix band_counts array size / padding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 17:17:47 +02:00
Paul B Mahol
4413dcc035 avcodec/exr: piz decompression 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-16 14:54:59 +00:00
Michael Niedermayer
4d41a25d39 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: Move 8x8 in a separate function

Conflicts:
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 15:08:10 +02:00
Michael Niedermayer
8210e38461 Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD 
* commit '95587859cc69e5abe37c9e3af48008032d98e262':
  mpegvideo: Move obmc in a separate function

Conflicts:
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 14:51:00 +02:00
Michael Niedermayer
ab16d5b7b5 Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886' 
* commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
  ffv1: Assume bitdepth 0 means 8bit

Conflicts:
	libavcodec/ffv1dec.c

Note, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 14:02:43 +02:00
Michael Niedermayer
8610751d07 Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860' 
* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
  mpegvideo: K&R formatting cosmetics

Conflicts:
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 13:54:41 +02:00