]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 21 Mar 2015 13:30:19 +0000 (14:30 +0100)]
Merge commit '
56febc993b928ccc039a32158ca60b234c311875 '
* commit '
56febc993b928ccc039a32158ca60b234c311875 ':
h264: move the slice type variables into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 13:16:29 +0000 (14:16 +0100)]
Merge commit '
5f390eef8ee2b8adab00c5d2923a52aa261eb999 '
* commit '
5f390eef8ee2b8adab00c5d2923a52aa261eb999 ':
h264: move mb_[uv]linesize into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 13:14:01 +0000 (14:14 +0100)]
Merge commit '
99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a '
* commit '
99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a ':
h264: move neighbor_transform_size into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 13:03:14 +0000 (14:03 +0100)]
Merge commit '
e6287f077c3e8e4aca11e61dd4bade1351439e6b '
* commit '
e6287f077c3e8e4aca11e61dd4bade1351439e6b ':
h264: move {mv,ref}_cache into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 13:02:02 +0000 (14:02 +0100)]
Merge commit '
f69574cf7aca4fe4d57a2155e925f37fc863474d '
* commit '
f69574cf7aca4fe4d57a2155e925f37fc863474d ':
h264: move non_zero_count_cache into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:58:11 +0000 (13:58 +0100)]
Merge commit '
64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e '
* commit '
64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e ':
h264: move *_samples_available into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:46:32 +0000 (13:46 +0100)]
avcodec/h264_cabac: Fix intra4x4_pred_mode_cache argument to av_dlog()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:44:38 +0000 (13:44 +0100)]
Merge commit '
7d8154edd594981e7891d57de91f2260f8a62939 '
* commit '
7d8154edd594981e7891d57de91f2260f8a62939 ':
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:42:44 +0000 (13:42 +0100)]
Merge commit '
8b00f4df20f4a8ab0656fdaf7d00233a6515a052 '
* commit '
8b00f4df20f4a8ab0656fdaf7d00233a6515a052 ':
h264: move some neighbour information into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:35:34 +0000 (13:35 +0100)]
Merge commit '
4bd5ac200d15b4f458a50f66006549825f9fc865 '
* commit '
4bd5ac200d15b4f458a50f66006549825f9fc865 ':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:35:02 +0000 (13:35 +0100)]
Merge commit '
5355ed6b20e941430c4f8fb82644e87a65366d61 '
* commit '
5355ed6b20e941430c4f8fb82644e87a65366d61 ':
h264: move {prev,next}_mb_skipped into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:34:30 +0000 (13:34 +0100)]
Merge commit '
06789ad3b71296a9e2fbd0278632d97a5d9af8d7 '
* commit '
06789ad3b71296a9e2fbd0278632d97a5d9af8d7 ':
h264: move qp_thresh into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:24:23 +0000 (13:24 +0100)]
Merge commit '
d231e84b06a9964c840cff4e228509f706165fb6 '
* commit '
d231e84b06a9964c840cff4e228509f706165fb6 ':
h264: move the quantizers into the per-slice context
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:20:49 +0000 (13:20 +0100)]
Merge commit '
d40ae0e595fe90b5583b9269f8bb000402bde5a6 '
* commit '
d40ae0e595fe90b5583b9269f8bb000402bde5a6 ':
h264: do not copy qscale when updating per-thread contexts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 12:13:12 +0000 (13:13 +0100)]
Merge commit '
92c6c2a605f9b077b8fbc25b7ed6625541232b87 '
* commit '
92c6c2a605f9b077b8fbc25b7ed6625541232b87 ':
h264: split weighted pred-related vars into per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 11:54:16 +0000 (12:54 +0100)]
avcodec/hevc_ps: Check cropping parameters more correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 11:08:14 +0000 (12:08 +0100)]
Merge commit '
d8a45d2d49f54fde042b195f9d5859251252493d '
* commit '
d8a45d2d49f54fde042b195f9d5859251252493d ':
h264_ps: properly check cropping parameters against overflow
Conflicts:
libavcodec/h264_ps.c
See:
c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move the slice type variables into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move mb_[uv]linesize into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move neighbor_transform_size into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move {mv,ref}_cache into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move non_zero_count_cache into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move *_samples_available into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move some neighbour information into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move {chroma,intra16x16}_pred_mode into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move {prev,next}_mb_skipped into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move qp_thresh into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 21:28:46 +0000 (22:28 +0100)]
h264: move the quantizers into the per-slice context
Anton Khirnov [Sat, 17 Jan 2015 20:51:40 +0000 (21:51 +0100)]
h264: do not copy qscale when updating per-thread contexts
It's a per-slice quantity constructed when parsing the slice header.
Anton Khirnov [Sat, 17 Jan 2015 17:45:29 +0000 (18:45 +0100)]
h264: split weighted pred-related vars into per-slice context
Michael Niedermayer [Sat, 21 Mar 2015 10:24:15 +0000 (11:24 +0100)]
Merge commit '
5127c00b971b674f72609369b39a9c0f7c36977d '
* commit '
5127c00b971b674f72609369b39a9c0f7c36977d ':
hevc: zero the correct variables on invalid crop parameters
Conflicts:
libavcodec/hevc_ps.c
See:
57e5812198aada016e9ba4149123c541f8c8a7ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Mar 2015 10:02:17 +0000 (11:02 +0100)]
Merge commit '
c929659bdd7d2d5848ea52e685a3164c7b901bb0 '
* commit '
c929659bdd7d2d5848ea52e685a3164c7b901bb0 ':
hevc: make the crop sizes unsigned
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 20 Mar 2015 20:49:23 +0000 (21:49 +0100)]
h264_ps: properly check cropping parameters against overflow
CC: libav-stable@libav.org
Anton Khirnov [Fri, 20 Mar 2015 20:30:29 +0000 (21:30 +0100)]
hevc: zero the correct variables on invalid crop parameters
It's the output_window that is applied to the output frame, not
pic_conf_win
Anton Khirnov [Fri, 20 Mar 2015 20:28:34 +0000 (21:28 +0100)]
hevc: make the crop sizes unsigned
Michael Niedermayer [Sun, 15 Mar 2015 18:42:48 +0000 (19:42 +0100)]
avcodec/hevc_refs: Silence "Could not find ref with POC" for CRA/BLA
Avoids error messages during seeking
Found-by: cousin_luigi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 23:24:31 +0000 (00:24 +0100)]
avformat/movenc: avoid using uninitialized display_matrix_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Vignali [Fri, 20 Mar 2015 20:29:02 +0000 (21:29 +0100)]
avcodec/metasound_data: remove unused variable lsp16s
the table was duplicated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 19:33:27 +0000 (20:33 +0100)]
Merge commit '
22a6d48b0d7367b3a45dd6db245f8ffaaa364995 '
* commit '
22a6d48b0d7367b3a45dd6db245f8ffaaa364995 ':
avconv: Print the avfilter errors
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:55:44 +0000 (19:55 +0100)]
Merge commit '
342fc46c69199b076b7c210f42208ce39a2bde1c '
* commit '
342fc46c69199b076b7c210f42208ce39a2bde1c ':
cmdutils: Add a stream specifier to map usable streams
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 19 Mar 2015 01:43:33 +0000 (22:43 -0300)]
libavutil: add bmi2 optimized av_mod_uintp2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 18 Mar 2015 18:08:45 +0000 (15:08 -0300)]
libavutil: add av_mod_uintp2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 20 Mar 2015 15:40:43 +0000 (16:40 +0100)]
avcodec/libvpxenc: Set min/max quantizer to 0 for lossless mode
Fixes Ticket4246
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:12:57 +0000 (19:12 +0100)]
avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:11:58 +0000 (19:11 +0100)]
avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:09:38 +0000 (19:09 +0100)]
avfilter/vf_phase: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 11 Mar 2015 00:44:47 +0000 (01:44 +0100)]
avconv: Print the avfilter errors
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Wed, 18 Mar 2015 12:40:12 +0000 (13:40 +0100)]
cmdutils: Add a stream specifier to map usable streams
It drops everything that cannot be used for re-encoding and/or
streamcopy.
Michael Niedermayer [Mon, 16 Mar 2015 14:31:57 +0000 (15:31 +0100)]
configure: Silence warnings about constant unsigned overflows in MSVC
unsigned overflows are well defined in C and used for example in crypto
and various other places.
None of the affected warnings currently shown points to an actual defect
untested
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
arwa arif [Fri, 13 Mar 2015 06:16:42 +0000 (11:46 +0530)]
lavfi/eq: rework expression evaluation
In particular, add support for t, pos, n, r parameters, and add an eval
mode option.
Also, partially reword option documentation.
With several major edit by Stefano Sabatini.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 13 Mar 2015 15:45:08 +0000 (16:45 +0100)]
lavfi/eq: factorize code in process_command()
James Almer [Fri, 20 Mar 2015 05:37:54 +0000 (02:37 -0300)]
x86/xvididct: add some yasm guards
Should fix compilation on compilers with less-than-ideal dead code elimination
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 20 Mar 2015 05:34:46 +0000 (02:34 -0300)]
x86/xvididct: remove obsolete function prototypes
Signed-off-by: James Almer <jamrial@gmail.com>
Martin Vignali [Thu, 19 Mar 2015 21:11:41 +0000 (22:11 +0100)]
avcodec/dv: remove unused var dvquantareas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Vignali [Thu, 19 Mar 2015 21:10:57 +0000 (22:10 +0100)]
avcodec/dv: remove unused var dv100qstep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Vignali [Thu, 19 Mar 2015 21:09:05 +0000 (22:09 +0100)]
avfilter/vf_pp7: remove unused var
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 20 Mar 2015 00:09:42 +0000 (21:09 -0300)]
avcodec/libdcadec: add missing version bump and changelog entry
Kacper Michajłow [Fri, 20 Mar 2015 00:58:25 +0000 (01:58 +0100)]
avcodec: Fix libdcadec include dir
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 00:45:26 +0000 (01:45 +0100)]
Merge commit '
30e6abd1a8cc4fd5daf2e23ad2e768862c39e975 '
* commit '
30e6abd1a8cc4fd5daf2e23ad2e768862c39e975 ':
webp: ensure that each transform is only used once
See:
c089e720c1b753790c746a13053636d7facf6bf0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 00:10:06 +0000 (01:10 +0100)]
Merge commit '
cf18e777aed9f73011c7ab7cbab8003189d4b9d8 '
* commit '
cf18e777aed9f73011c7ab7cbab8003189d4b9d8 ':
movenc: write the display transform matrix
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 19 Mar 2015 22:56:22 +0000 (23:56 +0100)]
avcodec: add libdcadec decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 19 Mar 2015 22:45:39 +0000 (23:45 +0100)]
avcodec: add profile define for DTS Express
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 22:56:31 +0000 (23:56 +0100)]
avcodec/dnxhddec: reset cur_field for non interlaced frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 22:33:36 +0000 (23:33 +0100)]
avcodec/dnxhddec: Reset is_444 if format is not 444
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 22:28:39 +0000 (23:28 +0100)]
avcodec/dnxhddec: Check that the frame is interlaced before using cur_field
Fixes Ticket4227
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 5 Mar 2015 21:48:28 +0000 (22:48 +0100)]
webp: ensure that each transform is only used once
According to the WebP Lossless Bitstream Specification
"each transform is allowed to be used only once".
If a transform is more than once this can lead to memory
corruption.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 12 Mar 2015 22:14:08 +0000 (23:14 +0100)]
movenc: write the display transform matrix
Michael Niedermayer [Thu, 19 Mar 2015 15:40:12 +0000 (16:40 +0100)]
avformat/avienc: Expand master ODML index when its end is reached
Fixes 256Gb limit
Fixes Ticket4225
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 15:37:16 +0000 (16:37 +0100)]
avformat/avienc: Fix wrongly placed comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 15:36:29 +0000 (16:36 +0100)]
avformat/avidec: also print frame_num in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 02:28:08 +0000 (03:28 +0100)]
avformat/avienc: factor out update_odml_entry()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 02:02:42 +0000 (03:02 +0100)]
avformat/avienc: factor write_odml_master() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 13:00:32 +0000 (14:00 +0100)]
Merge commit '
30a041887f89cd97c372ad6a516da6e012f2c88b '
* commit '
30a041887f89cd97c372ad6a516da6e012f2c88b ':
ismindex: Calculate the pts duration of trun atoms, not the dts duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 12:38:17 +0000 (13:38 +0100)]
Merge commit '
67a2912307c3c08f2725ccae162cfe3426b80184 '
* commit '
67a2912307c3c08f2725ccae162cfe3426b80184 ':
movenc: Don't assume that fragment durations in pts is equal to duration in dts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 12:26:44 +0000 (13:26 +0100)]
Merge commit '
5c337353a2546416631a87de4881850d99141c39 '
* commit '
5c337353a2546416631a87de4881850d99141c39 ':
movenc: Move sidx edit list timestamp adjustment into a block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:47:15 +0000 (12:47 +0100)]
Merge commit '
eee13d653953083553cceadbbedf6222ef78a006 '
* commit '
eee13d653953083553cceadbbedf6222ef78a006 ':
movenc: Only adjust the cts offset at the start of fragments if necessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:38:47 +0000 (12:38 +0100)]
Merge commit '
5cf892d6946b19a87bcd00d6b76ce81f45960fdb '
* commit '
5cf892d6946b19a87bcd00d6b76ce81f45960fdb ':
movenc: Write pts timestamps in tfxd, instead of dts timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:29:48 +0000 (12:29 +0100)]
Merge commit '
b81b0cc22b22413760423e239ea644c9afdbfa2d '
* commit '
b81b0cc22b22413760423e239ea644c9afdbfa2d ':
movenc: Set the last packet duration based on the next packet when autoflushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:18:02 +0000 (12:18 +0100)]
Merge commit '
3041183677bda0a431b36e96a2c76617abaa8183 '
* commit '
3041183677bda0a431b36e96a2c76617abaa8183 ':
dashenc: Heuristically fill in the duration of packets that need it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 10:24:00 +0000 (11:24 +0100)]
Merge commit '
2889c5e16711770437f380f1bead5f72c6a0b17a '
* commit '
2889c5e16711770437f380f1bead5f72c6a0b17a ':
movenc: Heuristically set the duration of the last sample in a fragment if not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 10:12:52 +0000 (11:12 +0100)]
Merge commit '
8dc72eeaf647736c287b59a3856a11904bedd58b '
* commit '
8dc72eeaf647736c287b59a3856a11904bedd58b ':
udp: Fix crashes after adding AVOptions
See:
aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 15 Mar 2015 22:18:37 +0000 (00:18 +0200)]
ismindex: Calculate the pts duration of trun atoms, not the dts duration
Since the duration is compared to the tfra durations/intervals which
are expressed in pts, calculate that here as well.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 15 Mar 2015 21:57:06 +0000 (23:57 +0200)]
movenc: Don't assume that fragment durations in pts is equal to duration in dts
For strict CFR, they should be pretty much equal, but if the stream
is VFR, there can be a sometimes significant difference.
Calculate the pts duration separately, used in sidx atoms and for
tfrf/tfxd boxes in smooth streaming ismv files.
Also make sure to reduce the duration of sidx entries according to
edit lists.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 16 Mar 2015 13:08:49 +0000 (15:08 +0200)]
movenc: Move sidx edit list timestamp adjustment into a block
When reading these values from track->frag_info, the same adjustment
has already been done.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 15 Mar 2015 21:40:06 +0000 (23:40 +0200)]
movenc: Only adjust the cts offset at the start of fragments if necessary
Adjusting it is only necessary when a sidx/tfrf/tfxd atom already has
been written for the previous fragment (since the sidx/tfrf/tfxd atoms
include the duration between the first pts of the previous fragment, to
the first pts of the new fragment).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 16 Mar 2015 11:02:59 +0000 (13:02 +0200)]
movenc: Write pts timestamps in tfxd, instead of dts timestamps
This matches what we write in tfra and tfrf since
9cbf70fa0e .
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 9 Mar 2015 09:47:54 +0000 (11:47 +0200)]
movenc: Set the last packet duration based on the next packet when autoflushing
When automatically flushing fragments based on set conditions
(fragmentation on keyframes, after some interval or byte size),
we already have the next packet for one stream - use this for setting
the duration of the last packet in the flushed fragment correctly.
This avoids having to adjust the timestamp of the first packet in
the new fragment since the last duration was unknown.
Unfortunately, this only works for automatic flushing (not for
caller-triggered flushing, like in the dash muxer), and only for the
one single track that triggered the flushing. The duration of the
last sample in all other tracks still is dependent on AVPacket
duration (or heuristics).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 6 Mar 2015 20:30:31 +0000 (22:30 +0200)]
dashenc: Heuristically fill in the duration of packets that need it
This avoids that the mp4 muxer does a similar heuristic, adjusting
the timestamps in a way that the dash muxer doesn't know the actual
timestamps written to the file in the end. By making sure that the
mp4 muxer internal heuristic isn't applied, we know the exact
timestamps written to file, so that the timestamps in manifest match
the files.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 6 Mar 2015 13:45:50 +0000 (15:45 +0200)]
movenc: Heuristically set the duration of the last sample in a fragment if not set
Even if this is a guess, it is way better than writing a zero duration
of the last sample in a fragment (because if the duration is zero,
the first sample of the next fragment will have the same timestamp
as the last sample in the previous one).
Since we normally don't require libavformat muxer users to set
the duration field in AVPacket, we probably can't strictly require
it here either, so don't log this as a strict warning, only as info.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Mar 2015 07:28:25 +0000 (09:28 +0200)]
udp: Fix crashes after adding AVOptions
Add a missing AVClass member, check whether localaddr is null.
(Previously, localaddr was always a local stack buffer, while it
now also can be an avoption string which can be null.)
This fixes crashes when not passing any localaddr parameter, since
66028b7ba .
Signed-off-by: Martin Storsjö <martin@martin.st>
Andreas Cadhalpun [Wed, 18 Mar 2015 20:57:58 +0000 (21:57 +0100)]
mxfenc: don't try to write footer without header
This fixes a crash, when trying to mux h264 into mxf_opatom.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Previous version reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 00:44:14 +0000 (01:44 +0100)]
avformat/aiffdec: do not fail if header parser hits EOF
Based on patch by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 00:39:47 +0000 (01:39 +0100)]
avformat/aiffdec: Stop header parsing once a non header packet is reached
Fix Ticket3530
Based-on debuging work by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 18 Mar 2015 22:58:30 +0000 (23:58 +0100)]
avfilter/vf_colormatrix: fix yuv420p threading, second try
Now seems to work fine with different combinations of odd/even heights
and odd/even number of threads.
Michael Niedermayer [Wed, 18 Mar 2015 22:28:43 +0000 (23:28 +0100)]
avcodec/mjpegdec: Support
31111100 sampling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 22:05:22 +0000 (23:05 +0100)]
avcodec/mjpegdec: Change upscale_* to an array instead of a bitmask
This allows storing integer factors instead of just 0 and 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 20:24:31 +0000 (21:24 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 20:14:52 +0000 (21:14 +0100)]
Merge commit '
8692d74b7364b405d7939c0ed347e8a2815193a7 '
* commit '
8692d74b7364b405d7939c0ed347e8a2815193a7 ':
mov: Add option to keep exact packet sequence after seeking
Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h
See:
414d6547f33175b3f53eb3320aa13161a584a151
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 18 Mar 2015 19:35:26 +0000 (20:35 +0100)]
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
This change allows remuxing hevc from mpeg-ts to Matroska.