summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '764ec70149728be82304c163ccc4e280f1629201'Michael Niedermayer2015-07-301-2/+3
|\ \ | |/ | | | | | | | | | | * commit '764ec70149728be82304c163ccc4e280f1629201': rtsp: Only interpret $ as interleaved packet indicator at the start of replies Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * rtsp: Only interpret $ as interleaved packet indicator at the start of repliesMartin Storsjö2015-07-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Allow $ as character anywhere within normal RTSP replies - both within the lines, and as the first character of RTSP header lines. (The existing old comment indicated that an inline packet could start at any line within a RTSP reply header, but that doesn't sound valid to me, and I'm not sure if the existing code handled that correctly either.) CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'Michael Niedermayer2015-07-301-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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: 82ef67016ef731268ab7b8e91139bd5f16edc991 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * hmac: add missing version bump and APIChanges entryJames Almer2015-07-302-1/+4
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'Michael Niedermayer2015-07-301-8/+89
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744': hls: Save and forward avio options Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * hls: Save and forward avio optionsLuca Barbato2015-07-301-13/+80
| | | | | | | | | | | | Make possible to send the custom headers and override the user agent. Reported-by: BenWonder
* | Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'Michael Niedermayer2015-07-301-1/+8
|\ \ | |/ | | | | | | | | | | * commit '5ae178539b91d25710b7bb322d156c31aea9f8bf': http: Add the trailing endlines if they are missing Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * http: Add the trailing endlines if they are missingLuca Barbato2015-07-301-1/+8
| | | | | | | | | | Makes slightly easier the life of those want to use the option from the command line
* | avcodec/y41penc: Drop coded_frame usageMichael Niedermayer2015-07-301-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/yuv4enc: drop coded_frame usageMichael Niedermayer2015-07-301-3/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/v308enc: Remove coded_frame usageMichael Niedermayer2015-07-301-3/+1
| | | | | | | | | | | | coded_frame is deprecated Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/v408enc: remove coded_frame usageMichael Niedermayer2015-07-301-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: modify tty state when stderr is redirectedGanesh Ajjanagadde2015-07-301-1/+1
| | | | | | | | | | | | | | This fixes Ticket2964 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'Michael Niedermayer2015-07-301-0/+4
|\ \ | |/ | | | | | | | | | | * commit 'bf0cef5c3a114df452e5476167634dd8f51eb448': checkasm: Include io.h for isatty, if available Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * checkasm: Include io.h for isatty, if availableMartin Storsjö2015-07-301-0/+4
| | | | | | | | | | | | | | | | configure does check for isatty, and checkasm properly checks HAVE_ISATTY, but on some platforms (e.g. WinRT), io.h needs to be included for isatty to be available. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'Michael Niedermayer2015-07-300-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '9487ffd4c02b9e261562d43735490068c0df0d4b': rtmpproto: free hmac context properly See: 6ce3d9fc4a70958680b93c6995cc87f34630a7e3 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * rtmpproto: free hmac context properlyJames Almer2015-07-301-1/+1
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceededMichael Niedermayer2015-07-302-2/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg12enc: extend QP range to 28 for non linear quantizersMichael Niedermayer2015-07-302-9/+31
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libvpxenc: report pict_type/error via side-dataJames Zern2015-07-291-2/+8
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Zern <jzern@google.com>
* | libvpxenc: quiet coded_frame deprecation warningsJames Zern2015-07-291-2/+6
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Zern <jzern@google.com>
* | avformat/rtmpproto: free hmac context properlyJames Almer2015-07-291-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/vf_pnsr: fix author nameJames Almer2015-07-291-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | doc/APIchanges: fill in some missing thingsMichael Niedermayer2015-07-301-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/hmac: fix API/ABI compatibility with the forkJames Almer2015-07-293-30/+44
| | | | | | | | | | | | | | | | | | | | The test code is updated with some cosmetics to avoid the loop using undefined AVHMACType values. The old enum values will be removed in the next major bump, effectively making both projects synced and without API or ABI issues. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31'Michael Niedermayer2015-07-300-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31': rtmpproto: use AVHMAC instead of a custom implementation See: 6c87b866285fae0a45ab4d7162088428f60bd332 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * rtmpproto: use AVHMAC instead of a custom implementationJames Almer2015-07-292-32/+10
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'Michael Niedermayer2015-07-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083': fate: add test vectors for HMAC SHA and SHA-2 Conflicts: libavutil/hmac.c tests/ref/fate/hmac See: 1163910a00595f01f5f6aabd5d69b01925429401 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * fate: add test vectors for HMAC SHA and SHA-2James Almer2015-07-292-13/+53
| | | | | | | | | | | | | | Also replace custom tests for MD5 with those published in RFC 2202 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | avutil/hmac: support another ABI difference to the forkMichael Niedermayer2015-07-301-0/+5
| | | | | | | | | | | | spotted this and so adding it. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'Michael Niedermayer2015-07-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7e38340b831af8e3271f22bd66b9da14953c02af': hmac: add support for SHA-2 Conflicts: libavutil/hmac.c libavutil/hmac.h See: 82ef67016ef731268ab7b8e91139bd5f16edc991 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * hmac: add support for SHA-2James Almer2015-07-292-5/+28
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | rawdec: fix mjpeg probing buffer size checkwm42015-07-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | rawdec: fix mjpeg probingwm42015-07-291-1/+1
| | | | | | | | | | | | | | | | There can be other headers than "Content-Type:" (in this case, a "Content-Length:" header was following), so checking for a trailing newline is wrong. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/oggdec: ogg_read_seek: reset ogg after seekingMichael Niedermayer2015-07-291-0/+1
| | | | | | | | | | | | Fixes Ticket4743 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/rtmpproto: use AVHMAC instead of a custom implementationJames Almer2015-07-292-32/+10
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | ffmpeg_op: Print warning if duration isnt known when -sseof is usedMichael Niedermayer2015-07-291-2/+6
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/ffmpeg: Use @codeMichael Niedermayer2015-07-291-1/+1
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dvbsubdec: Implement display definition segment fallback from ETSI ↵Michael Niedermayer2015-07-291-0/+7
| | | | | | | | | | | | | | | | | | EN 300 743 V1.3.1 Fixes: subtitles.ts Fixes: Ticket679 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer2015-07-293-0/+12
| | | | | | | | | | | | Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aacdec_fixed: Fix preparation for resamplerNedeljko Babic2015-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 2nd channel makes sense only for CPE type. Skip 2nd channel in preparation for resampler (in spectral_to _sample()) depending on block type. Fixes fate failure with clang ftrapv. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffplay: Use sws_scale to scale subtitlesMichael Niedermayer2015-07-291-213/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes some files from Ticket679 This also changes subtitles to 4:2:0 matching the output format and thus simplifying the blend code. This restricts placement to the chroma sample resolution though, speak up if you consider this a problem, say so, the code could be changed to use YUV444 for subtitles and scaling them down while blending, this would be slower though. The current code only uses a single swscale context and reinitializes it as needed, this could be changed as well if needed Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/wavdec: Check for data_size overflowMichael Niedermayer2015-07-291-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | wavdec: make sample count check more preciseGanesh Ajjanagadde2015-07-291-1/+1
| | | | | | | | | | | | | | May be used to fix Ticket4577 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_refs: Allow slightly larger pps_ref_count[0] in PAFF RAP ↵Michael Niedermayer2015-07-291-1/+2
| | | | | | | | | | | | | | | | detection heuristic Fixes Ticket4738 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_refs: extend RAP heuristic to multiple PPSMichael Niedermayer2015-07-291-3/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/utils: Set coded_frame.pict_type in generic codeMichael Niedermayer2015-07-291-0/+2
| | | | | | | | | | | | | | This makes it possible to remove more coded_frame usage without breaking the publically visible coded_frame Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/proresenc_anatoliy: remove coded_frame useMichael Niedermayer2015-07-291-3/+0
| | | | | | | | | | | | coded_frame.key_frame should be set by the core already Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/avcodec: define CODEC_FLAG based on AV_CODEC_FLAG instead of ↵Michael Niedermayer2015-07-281-30/+29
| | | | | | | | | | | | duplicating the numbers and comments Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2'Michael Niedermayer2015-07-281-1/+12
|\ \ | |/ | | | | | | | | | | * commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2': configure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt Merged-by: Michael Niedermayer <michael@niedermayer.cc>
OpenPOWER on IntegriCloud