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
74,440 Commits 39 Branches 425 Tags
c84d208c275d6a43b3c3421d38772179abf8acee
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer 012784052a avcodec/faxcompr: negate uncompressed runs 
Fixes remaining part of Ticket700

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 13:54:05 +02:00
Michael Niedermayer b2e95e012c avcodec/faxcompr: Factor decode_uncompressed() out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 13:47:18 +02:00
Michael Niedermayer ae2cb9290a ffmpeg_opt: Prefer audio streams with packets 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 10:43:16 +02:00
Michael Niedermayer 856452cf63 avformat/rmdec: MLTI with multiple MDPR support 
Fixes Ticket4496

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 04:40:00 +02:00
Michael Niedermayer 02fff49936 avformat/rmdec: Move MLTI handling out of ff_rm_read_mdpr_codecdata() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-14 03:32:00 +02:00
Michael Niedermayer 5fec7942bf doc/developer: Suggest everyone to help with patch reviews 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: compn <tempn@mi.rr.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 19:49:11 +02:00
Michael Niedermayer 7727f76230 avcodec/tiff: Support uncompressed G3 CCITT fax 
Fixes part of Ticket700

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 17:02:05 +02:00
Michael Niedermayer a4f9bb228b avcodec/faxcompr: Support uncompressed escapes in decode_group3_1d_line() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 17:01:11 +02:00
Michael Niedermayer dd1b4ed6d9 avcodec/tiff: Support uncompressed G4 CCITT fax 
Fixes part of ticket700

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 16:33:36 +02:00
Michael Niedermayer 38025e6898 avcodec/faxcompr: Support cmode == 9 && xxx == 7 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 16:11:00 +02:00
Michael Niedermayer bd2d4cc4a9 avcodec/faxcompr: Print the unsupported mode number 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 14:39:15 +02:00
Michael Niedermayer acbd78a001 avformat/wavdec: Detect wrongly interpreted specification about the sample value in the fact chunk 
Fixes Ticket703

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 12:38:31 +02:00
Michael Niedermayer 4ec4454ccf avformat/wavdec: Do not discard sample_count due to rounding 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 12:38:20 +02:00
Michael Niedermayer d21ab8e411 avcodec/dvbsubdec: Print field lens in case they are too lerge 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-13 01:50:08 +02:00
Michael Niedermayer 1f86079376 avcodec/mpeg12dec: Check chroma_format 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 22:51:40 +02:00
Michael Niedermayer 0d2a62d257 avformat/avidec: Simplify dshow_block_align based special case detection 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 22:51:40 +02:00
Michael Niedermayer 45c558563a avformat: Move MAX_PROBE_PACKETS to internal.h 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 17:33:47 +02:00
Michael Niedermayer 5f501f066e avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac 
The flac parser does not support it, its also not needed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 04:03:37 +02:00
Michael Niedermayer 254ff6e6bf avformat/avidec: Add flac to the dshow_block_align exception list 
Fixes Ticket4758

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 03:11:15 +02:00
Michael Niedermayer 542562e5ab avcodec/gsm_parser: Replace codec_id check by assert 
A parser should never be called with a mismatching codec

Found-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-12 01:00:20 +02:00
Michael Niedermayer 8992029fc0 avcodec/g729_parser: Replace codec_id check by assert 
A parser should never be called with a mismatching codec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-11 23:16:35 +02:00
Michael Niedermayer 8623aba043 doc/codecs: Document color_range for the input side 
Partly fixes Ticket 443

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-11 03:58:00 +02:00
Michael Niedermayer 55a07cf49c avformat/ftp: Use av_freep() for dir_buffer 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 18:46:38 +02:00
Michael Niedermayer b26497f824 avcodec/mjpegenc_common: do not ignore the color_range field 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 17:48:43 +02:00
Michael Niedermayer 46f15de8a4 avformat/gifdec: correct r_frame_rate for single frame gifs 
Fixes Ticket4650

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 04:45:27 +02:00
Michael Niedermayer 8c75a33812 postproc: Deprecate QP_STORE_T, it lacks a PP/AV/FF prefix 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-10 02:33:25 +02:00
Michael Niedermayer 0eb896b38d Revert "movtextdec: Use default style information from movtext header" 
The commit broke  sub-movtext and sub-subripenc
fate output differs between mips ad x86 so updating fate ref is not
possible

This reverts commit d670848d4c.
 2015-08-10 02:09:14 +02:00
Michael Niedermayer 0f9d46b70d swscale/alphablend: Support chroma subsampling 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 18:04:46 +02:00
Michael Niedermayer c5ebeaa308 swscale/alphablend: Support SWS_ALPHA_BLEND_CHECKERBOARD 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 17:11:53 +02:00
Michael Niedermayer 87100e828a swscale/alphablend: Factor target computation out of the loops 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 16:09:30 +02:00
Michael Niedermayer f28ba31b1b swscale/alphablend: Fix big endian formats on LE 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 15:59:12 +02:00
Michael Niedermayer b7faa9d314 swscale/alphablend: support packed pixel formats 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 15:58:43 +02:00
Michael Niedermayer 16df02fd2e avcodec/snowenc: Avoid use of deprecated me_method 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 14:33:31 +02:00
Michael Niedermayer c64f01227f swscale/swscale: Document param[0..1] 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-09 14:33:19 +02:00
Michael Niedermayer 5edab1d207 cmdutils: remove sws_opts usage, simplify code 
It has become unused as all code was switched to AVDictionary

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 16:51:25 +02:00
Michael Niedermayer 408c9cf0e2 cmdutils: Fix overriding flags on the command line. 
Previously the code just appended the strings of flags which
worked with "+bitexact" but would not work with something like "0"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:58:38 +02:00
Michael Niedermayer 6dbaeed6b7 ffmpeg: switch swscale option handling to AVDictionary similar to what the other subsystems use 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:44:15 +02:00
Michael Niedermayer d3d776ccf9 avfilter/vf_scale: apply generic options after flags. 
Otherwise the flags overwrite anything set by the generic stuff to the flags

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 14:44:15 +02:00
Michael Niedermayer e755954a84 ffplay: pass all sws options to the filter graph 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:25:12 +02:00
Michael Niedermayer 165fb7eba8 cmdutils: Export all sws options using a AVDictionary like the other subsystems do 
This makes extracting options other than sws_flags easier

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:24:52 +02:00
Michael Niedermayer 41e733c1ef avfilter/graphparser: Do not ignore scale_sws_opts if args == NULL 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:24:52 +02:00
Michael Niedermayer d0e0757e9a swscale: Implement alphablendaway for planar 4:4:4 formats 
Fixes Ticket4746

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:24:52 +02:00
Michael Niedermayer c382d9e8cb swscale: Add sws_alloc_set_opts() 
This simplifies allocating and initializing swscale contexts with custom options.
The function is internal currently but could be moved into the public header

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-08 13:08:16 +02:00
Michael Niedermayer 7d3aa2ca63 avutil/float_dsp: Remove use of deprecated av_set_cpu_flags_mask() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-07 22:46:27 +02:00
Michael Niedermayer 005d006938 avcodec/libopenh264enc: Avoid usage of deprecated ff_alloc_packet() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-07 22:46:27 +02:00
Michael Niedermayer bee2e702cc tests/fate/mp3: increase mp3-float-extra_overread FUZZ for ppc64be-RHEL7.0-gcc-4.8.2-ibmcrl to 23 from 20 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-07 02:54:59 +02:00
Michael Niedermayer ae413a48e6 avcodec/movtextdec: check that ftab has been allocated before dereferencing it 
Fixes potential null pointer dereference on deallocation

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 23:38:55 +02:00
Michael Niedermayer cb5190bc9d avcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated field from AVFrame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 12:44:37 +02:00
Michael Niedermayer a368920eef avcodec/options: Silence deprecated warning about coded_frame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 12:39:37 +02:00
Michael Niedermayer ace8376653 avformat/matroskaenc: Avoid "for (int i" syntax for better compatibility 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-06 01:15:08 +02:00
Michael Niedermayer e740659a5d avcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_* 
Avoid duplicating the literal numeric values

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 15:45:50 +02:00
Michael Niedermayer 4ab1f33daf avcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistency 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 15:45:50 +02:00
Michael Niedermayer 500bfbe27a avcodec/hapenc: Remove use of deprecated ff_alloc_packet() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 15:45:50 +02:00
Michael Niedermayer e5774f28d1 avcodec/dvbsubdec: Do not stop decoding at a invalid depth 
This corrects parsing the later elements

Fixes Ticket4754

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-05 00:16:43 +02:00
Michael Niedermayer 3f87a17063 avcodec/dvbsubdec: Allow selecting the substream, or all substreams 
Fixes Ticket 2161

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-04 14:24:13 +02:00
Michael Niedermayer e322b7061f avcodec/dcaenc: clear bitstream end 
This avoids leaving uninitialized bits in the output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-04 04:16:43 +02:00
Michael Niedermayer d903b62750 avcodec/internal: improve min_size documentation for ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-04 04:16:43 +02:00
Michael Niedermayer 2ca0ed9cfd doc/git-howto: Replace "git push" example by one with dry-run 
I do not think having "git push" as example is a good idea.
The command has a very high chance of pushing things which are unwanted to be
pushed

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 19:33:46 +02:00
Michael Niedermayer 8bdd0dbd60 avcodec/videotoolbox: Add missing AV_ prefix to CODEC_ID in comment 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 14:47:11 +02:00
Michael Niedermayer 6b0fa73b4d avcodec/videotoolbox: Fix bistream typo 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 14:46:24 +02:00
Michael Niedermayer 4302a92835 avcodec/pcm: Better min_size for ff_alloc_packet2() 
33318 -> 30601 decicycles

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 14:31:03 +02:00
Michael Niedermayer fdc2385ca9 avcodec/libwebpenc_animencoder: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 14:31:03 +02:00
Michael Niedermayer 77fb14f039 avcodec/rawenc: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 14:31:03 +02:00
Michael Niedermayer 7f46a641bf avcodec/aacdec: Fix integer overflow in argument to decode_audio_specific_config() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-03 01:41:13 +02:00
Michael Niedermayer 0508657f42 avcodec/cngenc: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 23:02:12 +02:00
Michael Niedermayer 7e9cd4e100 avcodec/libwebpenc: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 20:58:31 +02:00
Michael Niedermayer 06f2659891 avcodec/v210enc: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 20:57:39 +02:00
Michael Niedermayer 107026ea81 avcodec/aliaspixenc: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 20:36:24 +02:00
Michael Niedermayer 4a8ec0218e avcodec/avuienc: Use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 20:24:30 +02:00
Michael Niedermayer 8b11ce7137 avcodec/libutvideoenc: Remove coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 12:49:49 +02:00
Michael Niedermayer 582d98aed9 tests/fate/mp3: Fix fate-mp3-float-extra_overread on mips-qemu 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 11:26:58 +02:00
Michael Niedermayer f080a01fd3 avcodec/hevc_mp4toannexb_bsf: Remove ;; 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 03:52:37 +02:00
Michael Niedermayer b27d4fd997 Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs." 
Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer)
This reverts commit 293e25be61.
 2015-08-01 03:25:04 +02:00
Michael Niedermayer 55ea31ab89 Merge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg 
Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-01 03:08:04 +02:00
Michael Niedermayer f2c58931e6 MAINTAINERS: Remove myself as leader 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 15:55:20 +02:00
Michael Niedermayer 814d4c4c94 Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3' 
* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 11:56:42 +02:00
Michael Niedermayer d2077c860e Revert "ffmpeg: modify tty state when stderr is redirected" 
faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav

This reverts commit 92e62f49cf.
 2015-07-30 23:49:54 +02:00
Michael Niedermayer 802e51299e avcodec/r210enc: Drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 19:57:58 +02:00
Michael Niedermayer dfe8e3b381 avcodec/avuienc: Drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 19:57:07 +02:00
Michael Niedermayer bc4bdc6d61 Merge commit '764ec70149728be82304c163ccc4e280f1629201' 
* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 18:37:37 +02:00
Michael Niedermayer d560c61125 Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b' 
* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
  hmac: add missing version bump and APIChanges entry

Conflicts:
	libavutil/version.h

version.h is not changed as the code has been added 2 years ago in FFmpeg

See: 82ef67016e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 18:37:05 +02:00
Michael Niedermayer ba12ba859a Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744' 
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 17:52:23 +02:00
Michael Niedermayer 8e67599505 Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf' 
* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:24:03 +02:00
Michael Niedermayer 77d8fd5c9c avcodec/y41penc: Drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:14:23 +02:00
Michael Niedermayer 9ebffc5bba avcodec/yuv4enc: drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:14:06 +02:00
Michael Niedermayer a0123b6023 avcodec/v308enc: Remove coded_frame usage 
coded_frame is deprecated

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 15:54:45 +02:00
Michael Niedermayer 2d80de0be2 avcodec/v408enc: remove coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 15:53:54 +02:00
Michael Niedermayer 1919827f2c Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448' 
* commit 'bf0cef5c3a114df452e5476167634dd8f51eb448':
  checkasm: Include io.h for isatty, if available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 12:23:54 +02:00
Michael Niedermayer dd0dbaccb7 Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b' 
* commit '9487ffd4c02b9e261562d43735490068c0df0d4b':
  rtmpproto: free hmac context properly

See: 6ce3d9fc4a
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 12:14:54 +02:00
Michael Niedermayer f977e69dac avcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 05:00:54 +02:00
Michael Niedermayer bf2474c74f avcodec/mpeg12enc: extend QP range to 28 for non linear quantizers 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 05:00:54 +02:00
Michael Niedermayer 363995296f doc/APIchanges: fill in some missing things 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 03:09:04 +02:00
Michael Niedermayer 15a7a3cf0a Merge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31' 
* commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31':
  rtmpproto: use AVHMAC instead of a custom implementation

See: 6c87b86628
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 01:36:28 +02:00
Michael Niedermayer 277a5005b7 Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083' 
* commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083':
  fate: add test vectors for HMAC SHA and SHA-2

Conflicts:
	libavutil/hmac.c
	tests/ref/fate/hmac

See: 1163910a00
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 01:28:00 +02:00
Michael Niedermayer 8c5cc7b7fb avutil/hmac: support another ABI difference to the fork 
spotted this and so adding it.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 01:25:05 +02:00
Michael Niedermayer 865564c466 Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af' 
* commit '7e38340b831af8e3271f22bd66b9da14953c02af':
  hmac: add support for SHA-2

Conflicts:
	libavutil/hmac.c
	libavutil/hmac.h

See: 82ef67016e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 00:24:41 +02:00
Michael Niedermayer f8b81a02c9 avformat/oggdec: ogg_read_seek: reset ogg after seeking 
Fixes Ticket4743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:22:12 +02:00
Michael Niedermayer 0949869e7b ffmpeg_op: Print warning if duration isnt known when -sseof is used 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 18:58:57 +02:00
Michael Niedermayer 42209eb955 doc/ffmpeg: Use @code 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 18:58:40 +02:00
Michael Niedermayer 1fc20af6af avcodec/dvbsubdec: Implement display definition segment fallback from ETSI EN 300 743 V1.3.1 
Fixes: subtitles.ts
Fixes: Ticket679

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 18:02:07 +02:00