Michael Niedermayer
617a1a98a6
mp3enc: Properly write bitrate value in XING header
...
Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.
Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.
Bug-Id: https://bugs.debian.org/736088
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-12 13:29:55 +02:00
Michael Niedermayer
fb4ac46d7f
avcodec/elbg: Use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 05:40:37 +02:00
Michael Niedermayer
46375e9a97
avcodec/diracdec: use av_malloc(z)_array
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 05:38:31 +02:00
Michael Niedermayer
f683895dee
avformat/img2dec: support nanosecond file times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 04:52:01 +02:00
Michael Schenk
513a431e07
avformat/hls: reduce memory usage by using dynamically allocated url/key
...
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2014-04-12 03:14:52 +03:00
Michael Niedermayer
66e959682c
avcodec/mpegvideo_enc: override bitrate tolerance when its value is too small
...
Fixes Ticket3257
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 01:29:20 +02:00
Michael Niedermayer
27763db928
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Improve amr bitrate calculation for VBR files.
Warn if rawvideo and an unreadable pix_fmt are written.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 00:17:35 +02:00
Michael Niedermayer
88ceede1fd
avcodec/jpegls: print coding parameters stored in LSE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 23:39:09 +02:00
Carl Eugen Hoyos
c43222f436
Improve amr bitrate calculation for VBR files.
...
Fixes ticket #3541 .
2014-04-11 23:38:53 +02:00
Carl Eugen Hoyos
8b122937af
Warn if rawvideo and an unreadable pix_fmt are written.
...
Print an error if a combination of rawvideo and an unusual pix_fmt
that will be impossible to decode are written to avi or mov.
Fixes ticket #3545 .
2014-04-11 23:35:11 +02:00
Michael Niedermayer
662a8d8827
Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'
...
* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
resample: split linear into its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 20:39:04 +02:00
Michael Niedermayer
65088b925a
Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'
...
* commit 'be394968c81019887ef996a78a526bdd85d1e216':
resample: add initial padding explicitly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 20:38:38 +02:00
Michael Niedermayer
6d6bd16fce
Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'
...
* commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3':
resample: drop useless abs()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 20:23:33 +02:00
Michael Niedermayer
fb7d64df7e
Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'
...
* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
resample: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 19:34:31 +02:00
Michael Niedermayer
671f908657
Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'
...
* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
resample: split the nearest neighbour path into a separate function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 19:34:03 +02:00
Michael Niedermayer
c04961fa0f
Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'
...
* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
resample: fix avresample_get_delay() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 19:24:03 +02:00
Thilo Borgmann
d2417061ef
Add AVFoundation input device.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 17:51:33 +02:00
Anton Khirnov
254c95cdd1
resample: split linear into its own function
2014-04-11 16:34:02 +02:00
Anton Khirnov
be394968c8
resample: add initial padding explicitly
...
This simplifies the code, since we do not have to deal with a possibly
negative source index anymore.
2014-04-11 16:33:46 +02:00
Anton Khirnov
eed752d61d
resample: drop useless abs()
...
negative sample_index is handled in the block above.
2014-04-11 16:28:11 +02:00
Anton Khirnov
3c84f6b5d2
resample: reindent
2014-04-11 16:27:22 +02:00
Anton Khirnov
f20892eb67
resample: split the nearest neighbour path into a separate function pointer
2014-04-11 16:26:36 +02:00
Anton Khirnov
b9dea23766
resample: fix avresample_get_delay() return value
...
The correct "next" input sample is not the first sample of the
resampling buffer, but the center sample of the filter_length-sized
block at the beginning.
CC:libav-stable@libav.org
2014-04-11 16:21:25 +02:00
Lukasz Marek
c02e3dca2d
lavd: add control message enums
...
Adds messages that allows to control (audio) buffer and play/pause state.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-11 15:37:56 +02:00
Lukasz Marek
6db42a2b6b
lavd: add device capabilities API
...
Provides API to query device capabilities.
Each device must implement callbacks to benefit from this API.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-04-11 15:37:43 +02:00
Michael Niedermayer
4899ccd295
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
DNxHD: convert inline asm to yasm
Conflicts:
libavcodec/x86/Makefile
libavcodec/x86/dnxhdenc.asm
See: 9d34dce05b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 14:42:02 +02:00
Michael Niedermayer
ee2a43798c
Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
...
* commit '676856204b84dfaffe329dce8502e834a0dbdb19':
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
Conflicts:
libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc_init.c
See: cb11b9e89e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 14:28:19 +02:00
Michael Niedermayer
bad101ab8a
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
...
* commit '89ef08c992c484a46711b1a68a988303679c288e':
DNxHD: K&R formatting cosmetics
Conflicts:
libavcodec/dnxhd_parser.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 14:04:10 +02:00
Timothy Gu
71c32ed533
DNxHD: convert inline asm to yasm
2014-04-11 12:09:09 +02:00
Timothy Gu
676856204b
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
2014-04-11 12:09:09 +02:00
Vittorio Giovara
89ef08c992
DNxHD: K&R formatting cosmetics
2014-04-11 12:09:08 +02:00
Michael Niedermayer
d9fef740bd
avcodec/dnxhdenc: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 06:31:45 +02:00
Michael Niedermayer
1de8a4f736
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mp2: Do not force a samplerate
Conflicts:
libavcodec/mpegaudioenc_template.c
Only libtwolame changes, as the forcing of a sample rate was not merged for the native mp2 encoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 01:26:07 +02:00
Michael Niedermayer
268b1eae22
avcodec/mpegaudioenc_template: default to 384k bitrate as default
...
If 384k is too high for the samplerate, choose the closest
possible
Idea to increase the bitrate from: 46439e1562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 01:13:16 +02:00
Luca Barbato
a7448064c5
mp2: Do not force a samplerate
...
The default should be not to resample.
2014-04-11 00:09:34 +02:00
Anssi Hannula
39b192b8e1
avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol
...
ffurl_seek() will not work even when it should be a no-op, so do not
call it on crypto protocol.
Also replace use of ffurl_size() for the same reason.
Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2014-04-11 00:04:34 +03:00
Michael Niedermayer
517cc81e93
ffmpeg: stop protocols on interrupt when no transcoding has happened yet
...
Fixes Ticket3344
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 22:29:23 +02:00
Carl Eugen Hoyos
ecb80fe78c
Cosmetics: Remove an outdated comment from lavc/rawdec.c.
...
The missing swscale feature was implemented in 2011.
2014-04-10 22:25:39 +02:00
Michael Niedermayer
6290ba0052
avfilter/settb: remove duplicate #include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:58:03 +02:00
James Almer
09c1654208
lavf/rtspcodes: add missing header include
...
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:57:04 +02:00
Michael Niedermayer
a4662cd6b1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libx265: Only set the SAR if it is valid
libx265: Use 16-bit SAR
libx265: Use x265_param_parse to set the SAR
See: 8945dcbb52
See: fcc43e02d3
See: cdd21f1f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:34:08 +02:00
Michael Niedermayer
4d4bc89409
avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:25:51 +02:00
Michael Niedermayer
6e573b7759
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
...
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
mov: read hydrogenaudio replaygain information
Conflicts:
libavformat/Makefile
libavformat/mov.c
See: 37a15f3e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:25:15 +02:00
Michael Niedermayer
c486cfab79
avcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score()
...
This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used
It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 19:58:14 +02:00
Derek Buitenhuis
cdd21f1f03
libx265: Only set the SAR if it is valid
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-10 16:49:03 +01:00
Derek Buitenhuis
fcc43e02d3
libx265: Use 16-bit SAR
...
The spec says it is 16 bits.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-10 16:49:03 +01:00
Matt Oliver
d1e6e5c887
avcodec/x86: Exclude broken get_cabac under icl.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 17:47:22 +02:00
Michael Niedermayer
4764714952
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavfilter: Add asettb filter for setting timebase for audio
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h
See: ba856c0be5
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 15:08:04 +02:00
Derek Buitenhuis
25fbfeed98
libx265: Only set the SAR if it is valid
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-10 13:28:59 +01:00
Derek Buitenhuis
cd0ac6f6e5
libx265: Use 16-bit SAR
...
The spec says it is 16 bits.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-04-10 13:28:55 +01:00