Lou Logan
d9a61ae31e
presets: remove moldering iPod presets
...
* Some users are trying to use them for non-ancient iDevices when
baseline profile and level 1.3/3.0 would not be required.
* "640" and "320" no longer make sense.
* Some recommended options can be viewed at:
<https://trac.ffmpeg.org/wiki/Encode/H.264#iOS >
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 16:15:04 -08:00
Michael Niedermayer
cb037b5db4
Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'
...
* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
vp9 encoder: use a decent default speed setting
Conflicts:
libavcodec/libvpxenc.c
See: 34e32d6464
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 01:54:02 +02:00
Michael Niedermayer
3f2f87cd5a
Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'
...
* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
flvenc: Don't over-count metadata.
Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 01:44:24 +02:00
Michael Niedermayer
9f028b3f3a
Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'
...
* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
tiffenc: fix packet size calculation
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 01:29:19 +02:00
Michael Niedermayer
eb0fc73dcc
avfilter/vf_spp: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 00:07:30 +02:00
Michael Niedermayer
f31fd06713
vf_sab: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 00:07:12 +02:00
Rafaël Carré
9affa784a0
vp9 encoder: use a decent default speed setting
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-17 21:38:43 +02:00
Josh Allmann
74bc945805
flvenc: Don't over-count metadata.
...
Over-counting occurs if framerate is not set.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-17 21:38:21 +02:00
Tristan Matthews
4910684492
tiffenc: fix packet size calculation
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-17 21:24:12 +02:00
Michael Niedermayer
f9cd317223
Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'
...
* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
jpeg2000: Mark static data init functions as av_cold
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 20:42:10 +02:00
Diego Biurrun
fe4d5fe936
jpeg2000: Mark static data init functions as av_cold
2014-06-17 08:44:07 -07:00
Michael Niedermayer
a50c6f99b4
ffplay: remove -ec handling code
...
Its handled by the generic option code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 17:31:29 +02:00
plepere
92cccb7bcd
avcodec/hevc: new idct + asm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 13:23:36 +02:00
Michael Niedermayer
fa0d0fb42e
Merge commit '71d6551e674c86d07c165439c2bf6613b3892307'
...
* commit '71d6551e674c86d07c165439c2bf6613b3892307':
avconv: use the correct variable in comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 12:58:16 +02:00
Anton Khirnov
71d6551e67
avconv: use the correct variable in comparison
2014-06-17 09:01:26 +02:00
Michael Niedermayer
61df0819d4
avcodec/cavsdec: fix low delay decoding
...
Fixes Ticket1095
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17 02:30:28 +02:00
Michael Niedermayer
2fbdfba0f2
avformat/flvdec: Support live flv / NGINX RTMP streams
...
Fixes Ticket3553
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 23:43:11 +02:00
Michael Niedermayer
293d5d7a8e
swscale/input: fix harmless integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 23:28:32 +02:00
Simon Thelen
389d45351e
version string: add copyright line to version string
...
Show the copyright when running `ffmpeg -version'. This is useful for
end users trying to determine whether they are using FFmpeg or Libav.
Signed-off-by: Simon Thelen <ffmpeg@c-14.de>
2014-06-16 10:24:28 -08:00
Michael Niedermayer
e6f9fc4adc
avcodec/bitstream: try to make vlc init code inherently thread safe
...
also remove spinlock, it doesnt work on AIX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 20:09:21 +02:00
Michael Niedermayer
f7f96cf4bc
avcodec/bitstream: fill invalid vlc tables entries as last pass instead of first
...
This avoids writing entries twice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 19:10:32 +02:00
Michael Niedermayer
600cbf3672
avcodec/bitstream: zero vlc tables on allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 19:10:32 +02:00
Carl Eugen Hoyos
189ffeafd4
Force aix strip to work on 32 and 64 bit by default.
2014-06-16 16:46:10 +02:00
Michael Niedermayer
7eae8cd870
avcodec/h264: fix frame skip code
...
Fixes Ticket3475
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 13:28:52 +02:00
Michael Niedermayer
9025072e6c
avcodec/h264_slice: support skipping loop filtering for non key frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 13:18:55 +02:00
Michael Niedermayer
9140d37af2
avcodec/h264: use the correct level for droping non intra frames
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 13:18:43 +02:00
Michael Niedermayer
8a4a84a70a
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'
...
* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
configure: Directly support Android as target OS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 13:13:47 +02:00
Michael Niedermayer
60058c1880
Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'
...
* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
gitignore: add dylib and swp entries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 13:04:41 +02:00
Michael Niedermayer
f0fbd9105b
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
...
* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
lavf: dump stream side data when probing
Conflicts:
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:54:36 +02:00
Michael Niedermayer
7b7afaf849
avformat/dump: put copyright back from the file from which dump.c was split out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:48:19 +02:00
Michael Niedermayer
83d100baea
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'
...
* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
lavf: group dump functions together
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:48:03 +02:00
Michael Niedermayer
593dc5aed9
Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'
...
* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
vf_showinfo: print display transformation values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 12:09:20 +02:00
Luca Barbato
83aa4fc3fe
configure: Directly support Android as target OS
2014-06-16 10:52:29 +02:00
Vittorio Giovara
766f2d965f
gitignore: add dylib and swp entries
2014-06-16 01:31:37 -04:00
Michael Niedermayer
b152152df3
Add nointra AVDiscard level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 04:04:13 +02:00
Michael Niedermayer
fdb6f66def
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Do not suggest to use gas-preprocessor on aix where it doesn't work.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 01:38:48 +02:00
Ronald S. Bultje
edf930472b
swr: reindent.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 01:33:32 +02:00
Michael Niedermayer
20c7baf832
avcodec/huffyuvdec: Fix fill value for truncated bitstreams
...
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 01:07:42 +02:00
Carl Eugen Hoyos
08235708d8
Do not suggest to use gas-preprocessor on aix where it doesn't work.
2014-06-16 01:01:40 +02:00
Christophe Gisquet
f6577bd9cf
huffyuvdec: use unsafe bitstream reader
...
The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.
The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 00:52:09 +02:00
Christophe Gisquet
02bffc560f
huffyuv: fate: add a BGR24 test
...
It was previously untested.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-16 00:38:03 +02:00
Kieran
bc21260e64
hevc: Fix 4K sample video
...
Reviewed-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 23:24:11 +02:00
Michael Niedermayer
c1b15c16ef
avformat/smoothstreamingenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 23:21:46 +02:00
Carl Eugen Hoyos
b67bcd784d
Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed.
2014-06-15 22:51:23 +02:00
Anshul Maheshwari
fbb59a3bf4
avcodec/dvbsubdec: Split save_subtitle_set() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 20:16:49 +02:00
Anshul Maheshwari
77ade55fe5
avcodec/dvbsubdec: add AVClass to context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 19:59:26 +02:00
Anshul Maheshwari
9a11b33a2d
avcodec/dvbsubdec: restructure version check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 19:56:09 +02:00
Michael Niedermayer
153b5fb2fd
avformat/framecrcenc: print the checksum and size of extradata as well
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 18:07:03 +02:00
Christophe Gisquet
29f427c239
huffyuvdec: remove somewhat deprecated code
...
The old code was reserving the 0xFFFF entry to represent an inexisting
entry/codeword. These entries are now detected through their length
being <= 0. As this entry is often used for the residuals (-1,-1), which
should be among the most frequent, it is particularly important to not
reserve it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 17:43:47 +02:00
Christophe Gisquet
eb6f6f25dc
MAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1*
...
Patch by: Christophe Gisquet
Commit Message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-15 16:24:39 +02:00