Changeset 5584f019 in ffmpeg
- Timestamp:
-
Jun 18, 2016, 12:04:55 PM
(8 years ago)
- Author:
- Clément Bœsch <u@pkh.me>
- Branches:
- master
- Children:
- b51d5c99
- Parents:
- 403a53c6 (diff), 728d90a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- git-author:
- Clément Bœsch <u@pkh.me> (06/18/16 12:04:17)
- git-committer:
- Clément Bœsch <u@pkh.me> (06/18/16 12:04:55)
- Message:
-
Merge commit '728d90a0c1973661a9e73da697bf4f90c9d19577'
Main changes:
- SEI decoding doesn't have access to the debug flag in the codec context so a
few logging are dropped.
- naming of quincunx_sampling_flag and frame_packing_arrangement_type are kept
as they are in FFmpeg instead of respectively quincunx_subsampling and
arrangement_type used in Libav because the former match the specifications.
- don't reset the x264 build info once read in order to fix
fate-h264-lossless (change by Hendrik)
- H264Context.has_recovery_point and deprecated
AVCodecContext.dtg_active_format are set after ff_h264_sei_decode()
based on the SEI state since ff_h264_sei_decode() doesn't have access
to H264Context anymore.
- frame_packing_arrangement_type is not checked against <= 0 in
decode_postinit() since it is always read as a positive value with
get_bits(). This fixes a -Wtype-limits warning by GCC spotted by
Michael.
Side Notes:
- tested that ffprobe on the file from ticket #3652 still returns 4
keyframes
- tested that playback from ticket #3063 still works
Merged-by: Clément Bœsch <clement@stupeflix.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
-
(No files)
-
