Vittorio Giovara
d6006dd9f0
libvpxenc: Do not entangle coded_frame
...
Keep coded_frame.key_frame a write-only variable.
2015-07-20 14:13:42 +01:00
Vittorio Giovara
7fc8d8a1b3
libxvid: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
Vittorio Giovara
56672aeaee
svq1enc: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
Vittorio Giovara
05fb4c9aaf
proresenc: Do not entangle coded_frame
2015-07-20 14:13:42 +01:00
Vittorio Giovara
91767360d8
a64multienc: Do not entangle coded_frame
...
This change (and the following ones of the same kind) is mainly to
simplify wrapping this section with an #if FF_API block later on.
No functional changes are applied, the fields of the context coded_frame
fields are directly initialized, instead of keeping a reference to the
coded_frame itself.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 14:12:48 +01:00
Vittorio Giovara
95e2317ed8
roqvideoenc: Drop unneeded initialization
...
Its fields are never initialized to begin with.
2015-07-20 13:57:25 +01:00
Vittorio Giovara
1f171de8ca
mpegvideo_enc: Drop unnneded initialization
...
coded_frame is already initialized where needed.
2015-07-20 13:57:18 +01:00
周晓勇
fdac5ff682
avcodec: loongson relocate constants of idctdsp and h264pred
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 14:29:22 +02:00
周晓勇
4bd6193397
avcodec: loongson constants redefined with macros
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 14:29:22 +02:00
Paul B Mahol
7967474bd9
avfilter/af_amerge: increase max number of channels from 32 to 64
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-20 09:59:59 +00:00
James Almer
6de5b6cd86
avfilter/af_astats: use UINT64_C instead of the LLU suffix
...
Should fix compilation with vs2012
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-20 00:05:20 -03:00
Michael Niedermayer
9ebe041e1c
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
...
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 04:32:28 +02:00
Luca Barbato
e93ca480c9
parseutil: Add more resolution aliases
...
Add DCI 2k and 4k and uhd1 and uhd2.
2015-07-20 04:05:48 +02:00
Michael Niedermayer
cb53db144c
avformat/mp3dec: Rename sync() function to avoid build failure on android
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:41:44 +02:00
Michael Niedermayer
bf1fd59c6a
avformat/avidec: Fix demuxing avi with broken index
...
Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:11:49 +02:00
Michael Niedermayer
749f85496c
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 02:11:48 +02:00
Carl Eugen Hoyos
c239fcb948
lavc/jpeg2000: Signal lossless / bit-exact video stream.
2015-07-20 00:28:13 +02:00
Carl Eugen Hoyos
32d8726a31
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
2015-07-20 00:27:52 +02:00
Carl Eugen Hoyos
d8d2f934bd
lavc: Improve documentation for rc_max_rate and bit_rate.
...
Both may be set by user (libavformat) on decoding.
2015-07-20 00:27:51 +02:00
Michael Niedermayer
5c583b1419
avcodec/dds: Flip more R<->B cases
...
Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 00:03:11 +02:00
Michael Niedermayer
36a87c2dc7
avcodec/dds: fix paletted files
...
Fixes Ticket4664
The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 23:26:59 +02:00
James Almer
4ebe31abf1
RELEASE: update to 2.7.git
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-19 17:52:31 -03:00
James Almer
2db8c42ddc
avformat/mp3dec: remove unused variable
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-19 17:47:28 -03:00
Paul B Mahol
a8fbb7b625
avfilter: add random video filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-19 19:01:00 +00:00
Chris Spencer
eb468b0be0
avdevice/decklink: Add missing libraries when building with DeckLink support on Windows.
...
Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 20:32:41 +02:00
Vesselin Bontchev
0a551cbe97
Add support for Audible AAX (and AAX+) files
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 20:28:39 +02:00
Michael Niedermayer
4df66c7cd6
avformat/mp3dec: split position sync code out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 19:31:08 +02:00
Michael Niedermayer
ea8785ceda
avcodec/utils: Check that channel count is valid in avcodec_open2();
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 18:17:45 +02:00
Michael Niedermayer
9c943e077b
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
...
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asynchronous encoding
Conflicts:
libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:34:12 +02:00
Michael Niedermayer
f929081f2e
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
...
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:13:35 +02:00
Michael Niedermayer
7093e215d0
Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'
...
* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
af_resample: do not touch the timestamps if we are not resampling
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:05:33 +02:00
Michael Niedermayer
2dbaec690d
ffmpeg_filter: Check that filters have connected outputs before accessing the output stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 15:36:59 +02:00
Michael Niedermayer
bc3f19641c
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
...
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
avconv: split creating and (re-)configuring complex filtergraphs
Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 15:36:54 +02:00
Derek Buitenhuis
8271a84094
avfilter: Add reverse filter
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-07-19 14:13:51 +01:00
Michael Niedermayer
c7dd2365f4
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
...
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
avconv: create the complex filtergraphs earlier
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 14:12:11 +02:00
Michael Niedermayer
3b0534efdc
Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'
...
* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
avconv: move the no streams failure to open_output_file()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 14:01:45 +02:00
Michael Niedermayer
15fbf3e72a
Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'
...
* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
avconv: factor out the output stream initialization
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 13:50:33 +02:00
Michael Niedermayer
edd110ee45
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
...
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for reading the 2pass stats
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 13:33:44 +02:00
Michael Niedermayer
247f4d1f18
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
...
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
avconv: move handling the 2pass logfile into avconv_opt
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 12:59:05 +02:00
Michael Niedermayer
db3e12a828
Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'
...
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
avconv: set the encoding/decoding_needed flags earlier
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 12:44:07 +02:00
Michael Niedermayer
843be56ee1
ffmpeg_opt: Fix stream copy flag for attachments
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 12:43:36 +02:00
Michael Niedermayer
8534c8c77a
Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'
...
* commit '56c2f37727015212a404cae0f444d8bc8704d691':
avconv: drop update_sample_fmt()
Conflicts:
ffmpeg.c
No change as the removed code is not in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 11:57:34 +02:00
Michael Niedermayer
3d4297f851
Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'
...
* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
asfdec: make nb_sub to be unsigned int
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 11:52:35 +02:00
Michael Niedermayer
74aba00700
Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'
...
* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
asfdec: read the replicated data in a separate function
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 11:45:08 +02:00
Michael Niedermayer
80a37fc3e1
Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'
...
* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
asfdec: convert condition for the replicated data reading to be safer
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 11:29:55 +02:00
Michael Niedermayer
f509c9503a
Merge commit '406627287e015ce381795e85e2557b12bf60ca35'
...
* commit '406627287e015ce381795e85e2557b12bf60ca35':
asfdec: do not read replicated data when their length is 0
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 11:23:01 +02:00
Anton Khirnov
69b92f1b99
qsvenc: properly handle asynchronous encoding
...
Wait for async_depth frames before syncing.
2015-07-19 10:06:53 +02:00
Anton Khirnov
f5c4d38c78
qsvdec: properly handle asynchronous decoding
...
Wait for async_depth frames before syncing.
2015-07-19 09:47:45 +02:00
Anton Khirnov
6b15874fc2
af_resample: do not touch the timestamps if we are not resampling
...
This filter currently assumes that the input audio is continuous and
does some timestamps manipulation based on this assumption.
This is unnecessary if we are only converting the channel layout or the
sample format, without resampling. In such a case, just leave the
timestamps as they are.
2015-07-19 09:39:42 +02:00
Anton Khirnov
6d592fbd0d
avconv: split creating and (re-)configuring complex filtergraphs
...
The current code is less than straightforward due to the fact that
output streams can be created based on filtergraph definitions. This
change should make the code simpler and more readable. It will also be
useful in the future commits.
2015-07-19 09:38:53 +02:00