1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

75351 Commits

Author SHA1 Message Date
Henrik Gramner
6115966ad3 checkasm: v210: Fix array overwrite 2015-09-16 13:50:09 +02:00
Henrik Gramner
985e7d8cc1 checkasm: v210: s/Libav/FFmpeg/ 2015-09-16 13:48:43 +02:00
Hendrik Leppkes
64f72bb61f Merge commit '29b00f880faa404aa1d0d6820310c510c5996479'
* commit '29b00f880faa404aa1d0d6820310c510c5996479':
  jpeg2000: Templatize the frame writer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 12:08:39 +02:00
Paul B Mahol
dc1050a3e8 avfilter/af_ladspa: process all channels for nb_handles > 1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
Paul B Mahol
03f34e0d3c doc/filters: ladspa: add two more examples, this time using SWH plugins
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-16 09:45:59 +00:00
Timo Rothenpieler
dad38bff81 avcodec/vaapi_internal: Add missing include
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
2015-09-16 11:41:07 +02:00
Michael Niedermayer
fee2b97d56 avcodec/libxvid: add missing include
Fix build

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 11:38:20 +02:00
Hendrik Leppkes
5a754f92d1 Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e'
* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
  jpeg2000: Split codeblock decoding from the main tile decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:31:40 +02:00
Hendrik Leppkes
5de28d341f Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'
* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:31:11 +02:00
Hendrik Leppkes
52ce8b7b31 Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'
* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:27:20 +02:00
Hendrik Leppkes
7b865c222e Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'
* commit '5d14cf199990cd378904a2618b5c72c4b02290f6':
  mpegvideo: Make sure mpegutils.h is included where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:23:40 +02:00
Hendrik Leppkes
b3ff8ef6ec Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6'
* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:23:20 +02:00
Hendrik Leppkes
643a156002 Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'
* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:20:42 +02:00
Hendrik Leppkes
c2972a2800 Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'
* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:19:36 +02:00
Hendrik Leppkes
1eb2c0de9e Merge commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2'
* commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2':
  buffersrc: Improve initialization log message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:19:17 +02:00
Hendrik Leppkes
03d47f2ff1 Merge commit '2c6014c629346ebfeb25fc715581a8df9175f71f'
* commit '2c6014c629346ebfeb25fc715581a8df9175f71f':
  fate: Change global error option to private error_rate option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:18:28 +02:00
Hendrik Leppkes
25a7c2aed6 Merge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e'
* commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e':
  fate: Move mv0 option from global to mpv private

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:14:37 +02:00
Hendrik Leppkes
a600e7145f Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac'
* commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac':
  lavc: Keep idct integer option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:12:32 +02:00
Hendrik Leppkes
352eb4b599 Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'
* commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e':
  avconv_filter: Use full named options

Not merged, as ffmpeg option syntax is quite different.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:12:07 +02:00
Hendrik Leppkes
182550e42c Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5'
* commit '10de408738d28ab17aa5c1fdccd809b0637c12d5':
  lavf: Update to the new crypto API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-16 11:06:55 +02:00
Michael Niedermayer
cbbd906be6 avformat/flvdec: Check that sizes match and resync if not
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 03:43:21 +02:00
Michael Niedermayer
e01ad950bb avformat/rtmpproto: Fix 2nd packet size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 03:43:21 +02:00
Michael Niedermayer
3496a20bb9 avformat/flvdec: Change packet loop to return EAGAIN instead of looping until a valid packet is foud
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-16 03:32:27 +02:00
Ganesh Ajjanagadde
6d1801b5aa configure: make assignment of variable to '=' explicit
op== is confusing, as it may easily be mistook for an equality check,
while in reality it is doing an assigment to '='.
This patch has the additional benefit of cleaning up 2 warnings from shellcheck.net.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-15 14:58:48 -07:00
Thierry Foucu
164cd9b42a libavformat/riff.c: Add support for RV40 codec in AVI
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 23:21:47 +02:00
Ronald S. Bultje
bbd44e124a checkasm: add vp9 intra pred tests. 2015-09-15 16:43:29 -04:00
Ronald S. Bultje
084451e1e4 checkasm: add vp9 MC tests. 2015-09-15 16:43:28 -04:00
Paul B Mahol
eeaf19cee9 avfilter/vf_stereo3d: simplify blank calculations and check height
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 19:06:06 +00:00
Carl Eugen Hoyos
040ddd27bf lavc/utils: Correctly show bit_rate >INT_MAX.
Fixes ticket #2089.
2015-09-15 20:56:23 +02:00
Michael Niedermayer
72db5e96fc avcodec/ffv1enc: Fix error message when the requested version does not support the requested features
Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 20:46:04 +02:00
Ganesh Ajjanagadde
0f711126b8 avfilter/vsrc_cellauto: use the name 's' for the pointer to the private context
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-15 18:34:44 +00:00
Lou Logan
a62d4a01e8 README.md: avoid Github pull requests
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
2015-09-15 10:13:46 -08:00
Ganesh Ajjanagadde
f7b53c9527 avfilter/f_sendcmd: use the name 's' for the pointer to the private context
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2015-09-15 13:21:57 -04:00
Paul B Mahol
aaf4e703f6 avfilter/af_stereowiden: fix 2nd argument for av_calloc
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 16:27:52 +00:00
Carl Eugen Hoyos
b290972b8f lavf: Switch probesize and max_analyze_duration to 64bit.
Both are only accessible through AVOptions.
2015-09-15 18:02:51 +02:00
Carl Eugen Hoyos
c311713ca9 lavf: Switch bitrate to 64bit unless compatibility with avconv was requested.
Based on a patch by Steve Swanson, swanysteve at gmail.

Fixes ticket #2089.
2015-09-15 18:02:47 +02:00
Michael Niedermayer
7404f3bdb9 lavc: Switch bitrate to 64bit unless compatibility with avconv was requested. 2015-09-15 18:02:43 +02:00
Paul B Mahol
28e023377c doc/filters: mention newly added windowing functions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 15:23:39 +00:00
Ganesh Ajjanagadde
b26a45c2c3 avfilter/vf_vidstabdetect: use the name 's' for the pointer to the private context
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2015-09-15 11:12:49 -04:00
Ronald S. Bultje
a0d8a81075 vp9: switch min_tile_cols location so it shifts up instead of down.
This fixes cases where the shifted number is 64, but we shifted non-
zero numbers away in the shift. The change makes behaviour consistent
with libvpx.
2015-09-15 09:20:34 -04:00
Eloi BAIL
0edf6c8b2a rtpdec: add a trace when jitter buffer is full
This commit adds an error trace when jitter buffer
is full. It helps to understand leading decoding issues.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 13:34:51 +02:00
Eloi BAIL
bc3ea39415 rtpdec: inform jitter buffer size
This commit print as AV_LOG_INFO the jitter buffer
size. It might be the default value or the value set by application.

Signed-off-by: Eloi BAIL <eloi.bail@savoirfairelinux.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 13:34:51 +02:00
Ganesh Ajjanagadde
e76be9cd45 avfilter/vf_xbr: use the name 's' for the pointer to the private context
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-15 10:51:54 +00:00
Paul B Mahol
b0f9856616 avfilter: add stereowiden filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 09:34:22 +00:00
Paul B Mahol
f2b1df735e avfilter/avf_showfreqs: add lanczos and gauss windowing functions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 09:28:40 +00:00
Paul B Mahol
1c853d5727 avfilter/avf_showcqt: draw text optionally
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 07:54:47 +00:00
Paul B Mahol
92bfc3cd03 avcodec/dxv: remove code that is never reached
The function is automatically called.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-09-15 07:52:15 +00:00
Michael Niedermayer
59c1fec9fb avformat/avidec: Change (last)pos to 64bit
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 04:26:19 +02:00
Michael Niedermayer
3e2ef00394 avformat/avidec: Workaround broken initial frame
Fixes Ticket4851

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 04:26:19 +02:00
Rodger Combs
8e924629eb lavu/avstring: switch AV_ESCAPE_FLAGs to shift-based formatting
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-15 00:00:57 +02:00