ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 11:22:57 2015 +0200| [f509c9503a8fdb0ae7c5b0e6e932d3bc66249fcc] |
committer: Michael Niedermayer
Merge commit '406627287e015ce381795e85e2557b12bf60ca35'
* commit '406627287e015ce381795e85e2557b12bf60ca35':
asfdec: do not read replica
ffmpeg | branch: master | Alexandra Hájková |
Fri Jul 17 14:17:03 2015 +0200| [406627287e015ce381795e85e2557b12bf60ca35] |
committer: Anton Khirnov
asfdec: do not read replicated data when their length is 0
Signed-off-by: Anton Khirnov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commi
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 11:29:49 2015 +0200| [80a37fc3e10a093d3aff7c9f5c4f62c7d9688f23] |
committer: Michael Niedermayer
Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'
* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
asfdec: convert condition f
ffmpeg | branch: master | Alexandra Hájková |
Fri Jul 17 14:17:05 2015 +0200| [0989d3ad1fbd7509815208b0a5792918492d2a68] |
committer: Anton Khirnov
asfdec: convert condition for the replicated data reading to be safer
Signed-off-by: Anton Khirnov
> http://git.videolan.org/gitweb.cgi/ffmpeg.g
ffmpeg | branch: master | Alexandra Hájková |
Fri Jul 17 14:17:06 2015 +0200| [2883ef34b59c9b427c4cfad4620c3235e5778406] |
committer: Anton Khirnov
asfdec: read the replicated data in a separate function
Signed-off-by: Anton Khirnov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 11:38:33 2015 +0200| [74aba00700d8404cbdad5fce2193e7f26fbe3af4] |
committer: Michael Niedermayer
Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'
* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
asfdec: read the replicated
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 11:45:29 2015 +0200| [3d4297f851ec68475cd60f040f30ebe9c0822449] |
committer: Michael Niedermayer
Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'
* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
asfdec: make nb_sub to be u
ffmpeg | branch: master | Alexandra Hájková |
Fri Jul 17 14:17:07 2015 +0200| [e61f39849c2e2b7f492c17b42058242ed2fa4d57] |
committer: Anton Khirnov
asfdec: make nb_sub to be unsigned int
number of subpayloads should be always positive
Signed-off-by: Anton Khirnov
> http://git.videolan.org/g
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 11:57:34 2015 +0200| [8534c8c77a509987d6b63ed3b65155c3561b8583] |
committer: Michael Niedermayer
Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'
* commit '56c2f37727015212a404cae0f444d8bc8704d691':
avconv: drop update_sample_
ffmpeg | branch: master | Anton Khirnov | Sun Jun 28
07:41:22 2015 +0200| [56c2f37727015212a404cae0f444d8bc8704d691] | committer:
Anton Khirnov
avconv: drop update_sample_fmt()
There is only one decoder left that supports this (libopus, which is not
used by default since we have a native one)
ffmpeg | branch: master | Anton Khirnov | Sun Jun 28
08:03:44 2015 +0200| [59245e0c5e10a849e67c632cccf4f677b2442e82] | committer:
Anton Khirnov
avconv: set the encoding/decoding_needed flags earlier
This will be useful in the following commits.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 12:44:07 2015 +0200| [db3e12a828553171f37c98119679316720e4caed] |
committer: Michael Niedermayer
Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'
* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
avconv: set the encoding/de
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 12:35:10 2015 +0200| [843be56ee18928ecf80bcb20d235c4f9cab5a8fd] |
committer: Michael Niedermayer
ffmpeg_opt: Fix stream copy flag for attachments
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=c
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 12:57:32 2015 +0200| [247f4d1f181c2801b8321a7ddb88818dc4861155] |
committer: Michael Niedermayer
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
avconv: move handling the 2
ffmpeg | branch: master | Anton Khirnov | Sun Jun 28
08:37:58 2015 +0200| [6d5d9246042acb804a652e6fedfb7afe0ca85614] | committer:
Anton Khirnov
avconv: move handling the 2pass logfile into avconv_opt
It more logically belongs there.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=
ffmpeg | branch: master | Anton Khirnov | Sun Jun 28
08:45:02 2015 +0200| [bd2ab27c488ae92c7820efe11d4f53d84e94d58e] | committer:
Anton Khirnov
avconv: use read_file() for reading the 2pass stats
Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing ess
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 13:33:44 2015 +0200| [edd110ee4526849da487bb6be9c63fc77cb5a65a] |
committer: Michael Niedermayer
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
avconv: use read_file() for
ffmpeg | branch: master | Anton Khirnov | Sun Jun 28
10:49:19 2015 +0200| [ab7b038906f3e40ed474676d8e3029902a2078f5] | committer:
Anton Khirnov
avconv: factor out the output stream initialization
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab7b038906f3e40ed474676d8e3029902a2078
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 13:50:33 2015 +0200| [15fbf3e72a643b6b3d32ab6fa687ca2ca3d2fde1] |
committer: Michael Niedermayer
Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'
* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
avconv: factor out the outp
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 14:01:06 2015 +0200| [3b0534efdcde122ace74196be8c22afd9b03c017] |
committer: Michael Niedermayer
Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'
* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
avconv: move the no streams
ffmpeg | branch: master | Anton Khirnov | Wed Jul 15
15:51:39 2015 +0200| [1959351aecf09fc3e90208ff775f4849801dc13f] | committer:
Anton Khirnov
avconv: move the no streams failure to open_output_file()
It is a better place for it, there is no reason to wait until
transcode_init().
> http://gi
ffmpeg | branch: master | Anton Khirnov | Wed Jul 15
17:17:54 2015 +0200| [be101bc1e357c50fcb740bc4870b3bacc93a5727] | committer:
Anton Khirnov
avconv: create the complex filtergraphs earlier
Since global options are processed before all the other options now, we
do not have to try creating th
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 14:12:11 2015 +0200| [c7dd2365f432cf8338596a37e04556b66889d3e2] |
committer: Michael Niedermayer
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
avconv: create the complex
ffmpeg | branch: master | Derek Buitenhuis | Thu
Jul 16 17:43:59 2015 +| [8271a84094aafe142faa2305890413ea1110] |
committer: Derek Buitenhuis
avfilter: Add reverse filter
Signed-off-by: Derek Buitenhuis
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8271a84094aafe142faa2
ffmpeg | branch: master | Anton Khirnov | Wed Jul 15
19:49:24 2015 +0200| [6d592fbd0d8e89ecade3fc93b36ea200213dc01c] | committer:
Anton Khirnov
avconv: split creating and (re-)configuring complex filtergraphs
The current code is less than straightforward due to the fact that
output streams can
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 14:56:09 2015 +0200| [2dbaec690d9f8e25e12b80e1162097e96b30ddc8] |
committer: Michael Niedermayer
ffmpeg_filter: Check that filters have connected outputs before accessing the
output stream
Signed-off-by: Michael Niedermayer
> http:/
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 14:24:19 2015 +0200| [bc3f19641ce37d14f9cfd7e2693c4833b63fba7d] |
committer: Michael Niedermayer
Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
avconv: split creating and
ffmpeg | branch: master | Anton Khirnov | Thu Jul 16
19:26:36 2015 +0200| [6b15874fc2c3f565732201f7907ae1112727d6ae] | committer:
Anton Khirnov
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 times
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 15:45:15 2015 +0200| [7093e215d02ed0dc9632f82ac8ccec432d29cd35] |
committer: Michael Niedermayer
Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'
* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
af_resample: do not touch t
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 16:13:35 2015 +0200| [f929081f2e64d979fd8c58b17705e9554f99baf9] |
committer: Michael Niedermayer
Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
qsvdec: properly handle asy
ffmpeg | branch: master | Anton Khirnov | Tue Jul 14
18:16:26 2015 +0200| [f5c4d38c78347b09478e21a661befff4b2d44643] | committer:
Anton Khirnov
qsvdec: properly handle asynchronous decoding
Wait for async_depth frames before syncing.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 16:34:12 2015 +0200| [9c943e077bfc23ba8d2e76a17fef7acbab4dd706] |
committer: Michael Niedermayer
Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'
* commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031':
qsvenc: properly handle asy
ffmpeg | branch: master | Anton Khirnov | Tue Jul 14
18:16:26 2015 +0200| [69b92f1b99f3f210be19ee6ec06f6c0de1733031] | committer:
Anton Khirnov
qsvenc: properly handle asynchronous encoding
Wait for async_depth frames before syncing.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 18:17:18 2015 +0200| [ea8785cedae21b312e18a0bc9cb5ebcd3462cc6b] |
committer: Michael Niedermayer
avcodec/utils: Check that channel count is valid in avcodec_open2();
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Sat Jun 27 20:16:12 2015 +0200|
[95bd0f3a4b65e1641079f8bbdf391d0a2bfcd27a] | committer: Andreas Cadhalpun
wavpack: use get_bits_long to read up to 32 bits
get_bits should not be used for more than 25 bits.
Reviewed-by: Michael Niedermayer
Si
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Fri Jun 26 19:31:03 2015 +0200|
[72933729598240a05411d177a3f405b7694537de] | committer: Andreas Cadhalpun
s302m: fix arithmetic exception
If nb_samples is zero, the bit_rate calculation results in a division by
zero.
Since ff_get_buffer fails
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Sat Jun 27 17:50:56 2015 +0200|
[eddf146ada12b394a7796af12bff2121505dc4a1] | committer: Andreas Cadhalpun
nutdec: check maxpos in read_sm_data before returning success
Otherwise sm_size can be larger than size, which results in a negative
pack
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Fri Jun 26 00:27:54 2015 +0200|
[f66d2bf94909904109f6b0609516c10f9f3f3db4] | committer: Andreas Cadhalpun
mpegaudiodec: copy AVFloatDSPContext from first context to all contexts
This fixes a segfault when decoding multi-channel MP3onMP4 files.
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Tue Jun 30 21:09:50 2015 +0200|
[70b97a89d2d7ba837c830b1da5924314d68fc3e7] | committer: Andreas Cadhalpun
ffmpeg: only count got_output/errors in decode_error_stat
If threading is used, the first (thread_count - 1) packets are read
before any
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Thu Jun 25 22:47:38 2015 +0200|
[2e1226a695dd2faada939e0bdc3ee166b05c3579] | committer: Andreas Cadhalpun
vc1dec: use get_bits_long and limit the read bits to 32
get_bits should not be used with more than 25 bits.
Reviewed-by: Michael Niederm
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Tue Jun 30 21:06:40 2015 +0200|
[1d1adf5ff42041810d4069ce03303706fbf13d8a] | committer: Andreas Cadhalpun
ffmpeg: exit_on_error if decoding a packet failed
This is the second part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Thu Jul 2 23:05:05 2015 +0200|
[f0af6e705f3b30f7f5afa3c24db27433af6b1bfc] | committer: Andreas Cadhalpun
wavpack: limit extra_bits to 32 and use get_bits_long
More than 32 bits can't be stored in an integer and get_bits should not
be used wit
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Sun Jun 28 11:21:54 2015 +0200|
[43f8a422b34302d94ba76eb9a5be75bc9881] | committer: Andreas Cadhalpun
huffyuvdec: validate image size
Reviewed-by: Michael Niedermayer
Signed-off-by: Andreas Cadhalpun
(cherry picked from commit 9a345802ed
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Fri Jul 10 19:41:43 2015 +0200|
[15466db69e60f486c44e4c3e680d27c951f125d7] | committer: Andreas Cadhalpun
Changelog update
Signed-off-by: Andreas Cadhalpun
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15466db69e60f486c44e4c3e6
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Tue Jun 30 21:01:29 2015 +0200|
[acfad331adde5b4ae247bf5748211e8fdb6b4ef5] | committer: Andreas Cadhalpun
pthread_frame: forward error codes when flushing
This is the first part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer
S
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Thu Jul 9 19:50:34 2015 +0200|
[26cb351452e76dc4a61028f277cf11b8d7abd74b] | committer: Andreas Cadhalpun
snow: remove an obsolete av_assert2
It asserts that the frame linesize is larger than 37, but it can be
smaller and decoding such frames
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Fri Jul 10 19:41:43 2015 +0200|
[f06d9dced4c7267008beae45f28ce4e1848ef403] | committer: Andreas Cadhalpun
hevc: check slice address length
It is used as get_bits argument and reading 0 bits isn't supported.
Reviewed-by: Michael Niedermayer
S
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Thu Jul 2 23:45:46 2015 +0200|
[762a5878a6b0bef923ef97c15fdb8274a0351278] | committer: Andreas Cadhalpun
webp: fix infinite loop in webp_decode_frame
The loop always needs at least 8 bytes for chunk_type and chunk_size.
If fewer are left, byt
ffmpeg | branch: release/2.7 | Andreas Cadhalpun
| Fri Jul 10 21:50:50 2015 +0200|
[27816fb9ef26af1fa820c434079491f155e67471] | committer: Andreas Cadhalpun
imc: use correct position for flcoeffs2 calculation
flcoeffs2[pos] should be the log2 of flcoeffs1[pos].
flcoeffs1[0] can be 0 here, thus
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 19:31:08 2015 +0200| [4df66c7cd6f77e9b3a2cc1aee092068087d3853d] |
committer: Michael Niedermayer
avformat/mp3dec: split position sync code out
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=comm
ffmpeg | branch: master | Vesselin Bontchev |
Sat Jul 11 18:02:47 2015 +| [0a551cbe97e01e8b6426560bbdda2c28f22f0fb9] |
committer: Michael Niedermayer
Add support for Audible AAX (and AAX+) files
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;
ffmpeg | branch: master | Chris Spencer | Sat Jul 18
20:20:25 2015 +0100| [eb468b0be03ec5d73ab03431c1985de8dd7064d1] | committer:
Michael Niedermayer
avdevice/decklink: Add missing libraries when building with DeckLink support on
Windows.
Signed-off-by: Chris Spencer
Signed-off-by: Michael N
ffmpeg | branch: master | Paul B Mahol | Wed Jul 15 01:48:37
2015 +| [a8fbb7b62597d346161b02c822bd851274d83527] | committer: Paul B Mahol
avfilter: add random video filter
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8fbb7b62597d346161b02c822bd8
ffmpeg | branch: master | James Almer | Sun Jul 19 17:47:01
2015 -0300| [2db8c42ddc58a2ee7d2bb6dedab927422de35f09] | committer: James Almer
avformat/mp3dec: remove unused variable
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2db8c42ddc58a2ee7d2bb6deda
ffmpeg | branch: master | James Almer | Sun Jul 19 17:52:10
2015 -0300| [4ebe31abf1b48b86300d11bd0421d47b762c4bd2] | committer: James Almer
RELEASE: update to 2.7.git
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ebe31abf1b48b86300d11bd0421d47b762c4bd
[ffmpeg] [branch: refs/tags/n2.8-dev]
Tag:39b36a0a462e38bdbf225ca7bff6cceab5ca0af5
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=39b36a0a462e38bdbf225ca7bff6cceab5ca0af5
Tagger: James Almer
Date: Sun Jul 19 18:11:27 2015 -0300
Main development, master branch after release/2.7 bra
ffmpeg | branch: master | Michael Niedermayer | Sun
Jul 19 22:55:16 2015 +0200| [36a87c2dc7f302da3778bd0cff050b5c93a730c7] |
committer: Michael Niedermayer
avcodec/dds: fix paletted files
Fixes Ticket4664
The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off
ffmpeg | branch: master | Michael Niedermayer | Mon
Jul 20 00:03:11 2015 +0200| [5c583b141980102530c75d2756b06766742532a1] |
committer: Michael Niedermayer
avcodec/dds: Flip more R<->B cases
Fixes Ticket4665
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/
ffmpeg | branch: master | Carl Eugen Hoyos | Sun Jul 19
22:32:17 2015 +0200| [32d8726a31b79dd4e30922d689f3465edc9d00ba] | committer:
Michael Niedermayer
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32d87
ffmpeg | branch: master | Carl Eugen Hoyos | Sun Jul 19
22:31:23 2015 +0200| [d8d2f934bd008c1db585bd0487d2084689ae8ba5] | committer:
Michael Niedermayer
lavc: Improve documentation for rc_max_rate and bit_rate.
Both may be set by user (libavformat) on decoding.
> http://git.videolan.org/gitwe
ffmpeg | branch: master | Carl Eugen Hoyos | Sun Jul 19
22:34:13 2015 +0200| [c239fcb94893db484a6a1ef6c7b915cf54c03a9f] | committer:
Michael Niedermayer
lavc/jpeg2000: Signal lossless / bit-exact video stream.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c239fcb94893db484a6a1ef6
ffmpeg | branch: master | Michael Niedermayer | Mon
Jul 20 02:10:04 2015 +0200| [749f85496ccff345ec811976ce45ec9e1900e9a8] |
committer: Michael Niedermayer
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitwe
ffmpeg | branch: master | Michael Niedermayer | Mon
Jul 20 02:10:40 2015 +0200| [bf1fd59c6a22854ddc601f3125ff55ba5f82ad24] |
committer: Michael Niedermayer
avformat/avidec: Fix demuxing avi with broken index
Fixes: genio-avi
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitwe
ffmpeg | branch: master | Michael Niedermayer | Mon
Jul 20 02:41:44 2015 +0200| [cb53db144c104f447782b8918e94704484aedc8b] |
committer: Michael Niedermayer
avformat/mp3dec: Rename sync() function to avoid build failure on android
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/g
[ffmpeg] [branch: refs/tags/n2.7.2]
Tag:2c0b04c622eea65a7bbdbd38b3ed8b1e92cb2dd5
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=2c0b04c622eea65a7bbdbd38b3ed8b1e92cb2dd5
Tagger: Michael Niedermayer
Date: Mon Jul 20 03:41:39 2015 +0200
FFmpeg 2.7.2 release
__
The branch, master has been updated
via 8daf3add3f0e3e6174feefae372afce0ddfd1d78 (commit)
from a1c22e8860a3c468d078f265108cf7538b17f72a (commit)
- Log -
commit 8daf3add3f0e3e6174feefae372afce0ddfd1d78
Author: Micha
ffmpeg | branch: master | Michael Niedermayer | Mon
Jul 20 04:32:28 2015 +0200| [9ebe041e1ca898ed725051460961f1fda5f7a20b] |
committer: Michael Niedermayer
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolut
ffmpeg | branch: master | Luca Barbato | Fri Jul 17
00:31:54 2015 +0200| [e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2] | committer:
Luca Barbato
parseutil: Add more resolution aliases
Add DCI 2k and 4k and uhd1 and uhd2.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e93ca480c91397f
ffmpeg | branch: master | James Almer | Mon Jul 20 00:04:38
2015 -0300| [6de5b6cd861639ad7238b9cf629f50669fc6dd0c] | committer: James Almer
avfilter/af_astats: use UINT64_C instead of the LLU suffix
Should fix compilation with vs2012
Signed-off-by: James Almer
> http://git.videolan.org/gitwe
69 matches
Mail list logo