summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | lavf/avio: do not include bprint.h.Nicolas George2014-07-252-2/+2
| | | | | | | | | | | | | | | | | | C++ chokes on the definition of AVBPrint. Including avio.h from c++ code used to work. Fix trac ticket #3800. Signed-off-by: Nicolas George <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/segment: re-interleave packets if neededMichael Niedermayer2014-07-241-1/+1
| | | | | | | | | | | | Fixes part of Ticket 3797 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: support re-interleaving packets in ff_write_chained()Michael Niedermayer2014-07-249-10/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: keep AVPacket fields consistent in ff_write_chained()Michael Niedermayer2014-07-241-1/+6
| | | | | | | | | | | | | | This might have caused double frees in theory, i do not have a test case though Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/matroskaenc: print a warning when the relative timestamp wouldnt ↵Michael Niedermayer2014-07-241-1/+1
| | | | | | | | | | | | | | | | fit in 16bit This is somewhat unusual so its better to use warning level than debug Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '436ced244fadcde2c0b925627920e84b25482542'Michael Niedermayer2014-07-241-2/+0
|\| | | | | | | | | | | | | * commit '436ced244fadcde2c0b925627920e84b25482542': mpegenccontext: Remove unused opaque pointer Merged-by: Michael Niedermayer <[email protected]>
| * mpegenccontext: Remove unused opaque pointerNidhi Makhijani2014-07-241-2/+0
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | avformat/matroskaenc: Start new cluster if relative timestamp could not ↵Michael Niedermayer2014-07-241-0/+8
| | | | | | | | | | | | otherwise be stored Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/matroskaenc: Factor mkv_start_new_cluster() outMichael Niedermayer2014-07-241-14/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-07-241-1/+16
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Ignore xing number of frames if the file is larger than indicated. Merged-by: Michael Niedermayer <[email protected]>
| * | Ignore xing number of frames if the file is larger than indicated.Carl Eugen Hoyos2014-07-241-1/+16
| | | | | | | | | | | | Fixes ticket #3777.
* | | hevc: propagate error code from set_sps()Timothy Gu2014-07-241-1/+2
|/ / | | | | | | | | Signed-off-by: Timothy Gu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Print a warning instead of requesting a sample for an invalid exif tag.Carl Eugen Hoyos2014-07-241-0/+5
| | | | | | | | | | Fixes ticket #3792. Reviewed-by: Thilo Borgmann
* | lavfi/src_movie: minor simplificationsLukasz Marek2014-07-241-5/+3
| | | | | | | | | | Signed-off-by: Lukasz Marek <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | lavfi/src_movie: remove frame from priv contextLukasz Marek2014-07-241-15/+13
| | | | | | | | | | | | | | | | | | | | This variable is used only inside one function. There is no need to store it in context. This also may prevent crush by double free frame. Signed-off-by: Lukasz Marek <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'Michael Niedermayer2014-07-241-109/+115
|\| | | | | | | | | | | | | | | | | | | * commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <[email protected]>
| * http: K&R formatting cosmeticsDiego Biurrun2014-07-231-104/+110
| | | | | | | | Also comment some #endifs and reshuffle headers into canonical order.
* | Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'Michael Niedermayer2014-07-241-3/+3
|\| | | | | | | | | | | | | | | | | | | * commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4': fft-test: Pass correct struct members to (i)dct functions Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: Pass correct struct members to (i)dct functionsDiego Biurrun2014-07-231-3/+3
| | | | | | | | This fixes a number of incompatible pointer type warnings.
* | Merge commit '6133d65861f265d429ade53e910fe877c95a1615'Michael Niedermayer2014-07-241-80/+85
|\| | | | | | | | | | | | | | | | | | | * commit '6133d65861f265d429ade53e910fe877c95a1615': fft-test: K&R formatting cosmetics Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: K&R formatting cosmeticsDiego Biurrun2014-07-231-77/+82
| | | | | | | | Also rearrange #includes into canonical order.
* | avcodec/fft-test: fix memory alloc checksMichael Niedermayer2014-07-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'Michael Niedermayer2014-07-241-4/+13
|\| | | | | | | | | | | | | | | | | | | * commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9': fft-test: Check memory allocations Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: Check memory allocationsDiego Biurrun2014-07-231-4/+13
| |
* | x86: hevcdsp: alignChristophe Gisquet2014-07-231-29/+27
| | | | | | | | | | Reviewed-by: Mickaël Raulet <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | hevc_mvs: avoid deriving tmvp in amvpChristophe Gisquet2014-07-231-1/+2
| | | | | | | | | | | | | | Reduces on a sequence number of calls from 933685 to 586271. Reviewed-by: Mickaël Raulet <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | hevcdsp: change types of SAO parametersChristophe Gisquet2014-07-232-6/+6
| | | | | | | | | | | | | | From openhevc Reviewed-by: Mickaël Raulet <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '7288b345850792430302a8f85a4b29140b770497'Michael Niedermayer2014-07-231-24/+23
|\| | | | | | | | | | | | | | | | | | | * commit '7288b345850792430302a8f85a4b29140b770497': fft-test: Drop unnecessary pointer indirection for context structs Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: Drop unnecessary pointer indirection for context structsDiego Biurrun2014-07-231-24/+23
| |
* | Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'Michael Niedermayer2014-07-231-51/+36
|\| | | | | | | | | | | | | | | | | | | * commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb': fft-test: Reduce variable scope where sensibly possible Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: Reduce variable scope where sensibly possibleDiego Biurrun2014-07-231-51/+36
| | | | | | | | Also merge variable declaration and initialization.
* | Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'Michael Niedermayer2014-07-231-4/+0
|\| | | | | | | | | | | | | * commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7': mpegenccontext: Remove unused dct_unquantize_h261 function pointers Merged-by: Michael Niedermayer <[email protected]>
| * mpegenccontext: Remove unused dct_unquantize_h261 function pointersNidhi Makhijani2014-07-231-4/+0
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | lavd/lavfi: work with non-mappable files for graph_file optionAndrey Utkin2014-07-231-15/+15
| | | | | | | | | | | | | | Example of non-mappable file is /dev/stdin. Previously passing it as graph_file value returned error. Signed-off-by: Michael Niedermayer <[email protected]>
* | avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)Andrey Utkin2014-07-234-2/+32
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 tooMichael Niedermayer2014-07-231-1/+2
| | | | | | | | | | | | Fixes Ticket 3787 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATAMichael Niedermayer2014-07-231-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/h264: factor is_extra() outMichael Niedermayer2014-07-231-20/+24
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '20ec0daaa1cdd3996ac6ed0198de961129474044'Michael Niedermayer2014-07-231-1/+1
|\| | | | | | | | | | | | | * commit '20ec0daaa1cdd3996ac6ed0198de961129474044': fft-test: Make global exptab variable static Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: Make global exptab variable staticDiego Biurrun2014-07-231-1/+1
| |
* | Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'Michael Niedermayer2014-07-232-1/+3
|\| | | | | | | | | | | | | * commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb': mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used Merged-by: Michael Niedermayer <[email protected]>
| * mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is usedDiego Biurrun2014-07-232-1/+3
| |
* | avcodec/x86/hevc_deblock: Fix compilation with nasm.Carl Eugen Hoyos2014-07-231-2/+2
| |
* | avutil/opt: Fix parsing regression with constants starting with numbersMichael Niedermayer2014-07-231-31/+34
| | | | | | | | | | | | | | Fixes parsing "3dnow" Found-by: jamrial Signed-off-by: Michael Niedermayer <[email protected]>
* | Changelog: add "version <next>:" so people dont add new things to the last ↵Michael Niedermayer2014-07-231-0/+3
| | | | | | | | | | | | release Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e'Michael Niedermayer2014-07-231-1/+1
|\| | | | | | | | | | | | | * commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e': configure: Extend the neon intrinsics check Merged-by: Michael Niedermayer <[email protected]>
| * configure: Extend the neon intrinsics checkMartin Storsjö2014-07-221-1/+1
| | | | | | | | | | | | | | Check for an instruction that causes the (very old) Apple GCC 4.2 to error out ("unrecognizable insn"). Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'Michael Niedermayer2014-07-231-6/+6
|\| | | | | | | | | | | | | | | | | | | * commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc': fft-test: Comment some #endifs Conflicts: libavcodec/fft-test.c Merged-by: Michael Niedermayer <[email protected]>
| * fft-test: Comment some #endifsDiego Biurrun2014-07-221-6/+6
| |
* | Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'Michael Niedermayer2014-07-231-2/+0
|\| | | | | | | | | | | | | * commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5': fft-test: Drop unnecessary #ifdefs around header includes Merged-by: Michael Niedermayer <[email protected]>