virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
57,462 Commits 39 Branches 425 Tags
21f22908c6aef7d7e348cff33c017d70b8b88733
Commit Graph
57462 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timothy GuandMichael Niedermayer 21f22908c6 MAINTAINERS: add my name for Launchpad 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 12:11:06 +01:00
Michael Niedermayer 09ef98f1ae avcodec/hevcpred_template: Fix integer overflows 
signed integer overflow is undefined in C

Fixes the following gcc warnings:
In file included from libavcodec/hevcpred.c:27:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_8’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:31:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_9’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:35:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_10’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 11:54:53 +01:00
Michael Niedermayer 10386710fd Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a' 
* commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a':
  hevc_parser: Set pict_type, key_frame and output_picture_number.
  hevc: Search start code in decode_nal_units().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 11:29:37 +01:00
Yusuke NakamuraandMickaël Raulet afa93d198a hevc_parser: Set pict_type, key_frame and output_picture_number. 
Conflicts:
	libavcodec/hevc.c
 2013-10-27 11:07:43 +01:00
Yusuke NakamuraandMickaël Raulet f7f8801839 hevc: Search start code in decode_nal_units(). 
User may cut off a weird position and send a packet from there.
This avoids returning as invalid data immediately.
 2013-10-27 10:43:14 +01:00
Anton KhirnovandMichael Niedermayer 83d96e9a19 Changelog: add entry for HEVC support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 10:34:34 +01:00
Guillaume MartresandMichael Niedermayer 7b0f61a936 FATE: update HEVC tests 
This changes the tests that used the internal hevc checksum to use framecrc

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	tests/fate/hevc.mak
	tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
	tests/ref/fate/hevc-conformance-POC_A_Bossen_3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 10:15:56 +01:00
Michael Niedermayer 3b56f665b1 avcodec/flacdec: also do crc check when er compliant is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 09:51:21 +01:00
Anton KhirnovandMichael Niedermayer 346e09638c avcodec/error_resilience check error_concealment, not err_recognition. 
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 09:51:21 +01:00
Stefano Sabatini 4e268285aa cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
Stefano Sabatini d61617a523 lavu/parseutils: add av_get_known_color_name() 2013-10-27 09:16:05 +01:00
Michael Niedermayer 1e5271a9fd avformat/utils: do not override pts in h264 when they are provided from the demuxer 
Fixes Ticket2143

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 02:27:45 +02:00
Michael Niedermayer f3d0642d35 avutil/utils: check that size_t is unsigned 
ANSI/ISO C guarantee this, yet there is evidence that there exist
platforms where its not so.
See: http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library_30.html

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 22:08:06 +02:00
Michael Niedermayer c78a416985 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fft-test: add a missing #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 21:59:24 +02:00
Michael Niedermayer 3fcc2684e4 Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844' 
* commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844':
  mem: do not check for negative size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 21:49:04 +02:00
Michael Niedermayer d2db1bb7de avformat/http: dont fail with unknown Content-Encodings 
Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3

Based-on-patch-by: Crossle Song <sxm@yixia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 19:20:01 +02:00
Michael Niedermayer e0b2bdd37a avcodec/h264_parser: heuristically detect non marked keyframes 
Fixes Ticket3083

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 15:56:11 +02:00
Michael Niedermayer 41efb8d9a7 avcodec/x86/cabac: include get_cabac_bypass_sign_x86() under #if !BROKEN_COMPILER 
this might fix Ticket2999 as well as some fate clients
untested as the original patch submitter no longer has the environment to test
this should be reverted if it does not fix the issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 15:06:55 +02:00
Lukasz MarekandMichael Niedermayer 99a4c86a32 configure: link with built libs when pc-uninstalled is used 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 14:06:40 +02:00
Michael Niedermayer 444ce03f0f Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: add support for libswresample options
  ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
  ffplay: factor out picture freeing code
  ffplay: update and extend documentation for channel and stream switching

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 13:54:29 +02:00
Marton Balint 44758b4d17 ffplay: add support for libswresample options 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-26 12:23:54 +02:00
Marton Balint 04de0e04c5 ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-26 12:23:54 +02:00
Marton Balint 2d059d8de1 ffplay: factor out picture freeing code 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-26 12:23:54 +02:00
Marton Balint 060c42bc3d ffplay: update and extend documentation for channel and stream switching 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-26 12:23:54 +02:00
Michael Niedermayer fcd08b7770 avformat/md5enc: add format, version and column headers 
See Ticket2280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 12:16:04 +02:00
Michael Niedermayer 6889b78fe0 doc/issue_tracker: add 2 missing issue types 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 11:29:42 +02:00
Michael Niedermayer 0feecb62ab Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavd/pulse_audio_enc: avoid vars in for()
  lavd/pulse_audio_enc: add another default to stream name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 10:31:04 +02:00
Anton Khirnov 834259528b fft-test: add a missing #include 
stdio.h needed for printf since 7177df90a0
 2013-10-26 09:11:22 +02:00
Vittorio GiovaraandAnton Khirnov b284e1ffe3 mem: do not check for negative size 
size_t is guaranteed to be unsigned

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-26 09:05:56 +02:00
Michael Niedermayer 7e19c549ba Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: aac: Add test for AAC-ELD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 02:58:08 +02:00
Michael Niedermayer 8c508a0354 Merge commit 'adea4512c6087280702e2423de55cea050e20a98' 
* commit 'adea4512c6087280702e2423de55cea050e20a98':
  aacdec: Fix calls to avpriv_report_missing_feature().

See: 435a730e21
See: 72cf47b241

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 02:46:40 +02:00
Michael Niedermayer a665704402 Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4' 
* commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4':
  libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:
	libavutil/cpu.c
	libavutil/cpu.h
	libavutil/x86/cpu.c

See: 865b70bc5d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 02:36:36 +02:00
Kieran KunhyaandMichael Niedermayer 865b70bc5d Add AVX2 capable CPU detection. Patch based on x264's AVX2 detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 02:34:22 +02:00
Michael Niedermayer 780669ef7c avcodec/jpeg2000dec: non zero image offsets are not supported 
Fixes out of array accesses
Fixes Ticket3080
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 02:19:13 +02:00
Lukasz Marek c428170549 lavd/pulse_audio_enc: avoid vars in for() 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-26 01:58:18 +02:00
Lukasz Marek c6c70c2bf7 lavd/pulse_audio_enc: add another default to stream name 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2013-10-26 01:58:01 +02:00
Michael Niedermayer 3c9dd93faa h264: make flush_change() set mmco_reset 
This ensures that frames do not get mixed on context reinits

Fixes Ticket2836

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 01:22:38 +02:00
lemonlinger@gmail.comandMichael Niedermayer 2cf94485de avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed 
some video players on Android will not send udp hole punching messages if the rtcp port and rtp port are not two successive integers.
So, if the video player is behind NAT, it could not receive and rtp messages via udp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 22:40:21 +02:00
Alex Converse 4e326ec769 fate: aac: Add test for AAC-ELD 2013-10-25 19:41:23 +00:00
Alex Converse adea4512c6 aacdec: Fix calls to avpriv_report_missing_feature(). 
It does not take log level as an argument.
 2013-10-25 19:41:23 +00:00
Kieran KunhyaandDerek Buitenhuis 4d6ee07255 libavutil: x86: Add AVX2 capable CPU detection. 
Patch based on x264's AVX2 detection

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-25 19:36:55 +01:00
Michael Niedermayer 08a8976196 avcodec/h264: reduce noisiness of "mmco: unref short failure" 
Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame

Fixes Ticket2811

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 20:03:29 +02:00
Michael Niedermayer ba8716df7f avformat/mp3dec: perform seek resync in the correct direction 
Fixes seeking to the last frame in CBR files
Fixes Ticket2773

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 19:37:03 +02:00
Michael Niedermayer d04ec6ffc5 avformat/rmdec: english typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 19:14:36 +02:00
Michael Niedermayer 2e7a1fdd6d avcodec/twinvq: return the actual number of consumed bytes 
Fixes Ticket2980

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 17:25:26 +02:00
Michael Niedermayer cbb7f56dfe metasound & twinvqdec: return the number of read bytes from read_bitstream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 17:24:07 +02:00
Michael Niedermayer f5dae4894d configure: abort if threading without atomics is used 
also provide a list of workarounds to the user

Fixes Ticket2363

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 16:55:57 +02:00
Stefano Sabatini b4991292aa doc: add a few links to the Channel Layout syntax section 2013-10-25 15:44:12 +02:00
Stefano Sabatini a3505136f9 doc/utils: document channel layout specification 2013-10-25 15:44:04 +02:00
Michael Niedermayer d9ad305072 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fft-test: Remove possibility of returning restricted exit code
  dct-test: Remove possibility of returning a restricted exit code
  base64-test: Remove posibility of returning restricted exit codes
  tree-test: Don't return restricted exit codes

Conflicts:
	libavutil/base64.c

See: b2fdf3fc35
See: f80ca1cb00
See: cbbd0ac764
See: 5dfdffeb6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 13:35:53 +02:00