summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | lavf/http: remove special case for cookies attributes.Nicolas George2014-08-17
| | | | | | | | | | | | | | | With the previous change, unknown attributes are all ignored, as specified by the RFC.
| * | lavf/http: fix cookie parsing.Nicolas George2014-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code would use any unknown attribute-value pair as the cookie value. RFC 6265 states that the first key-value pair is the actual cookie, and the attribute-value pairs only start after. With the current code: Set-Cookie: test=good_value; path=/; dummy=42 gives this: Cookie: dummy=42 instead of this with the new code: Cookie: test=good_value
* | | avcodec/lcldec: fix decoding of YUV444 samplePiotr Bandurski2014-08-17
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_mb: fix grayscale only decoding with weighted predictionMichael Niedermayer2014-08-17
| | | | | | | | | | | | Fixes Ticket3412 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rpza: fix +- errorMichael Niedermayer2014-08-17
| | | | | | | | | | | | Fixes Ticket3471 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vcodec/rpza: print mismatching size in case of errorMichael Niedermayer2014-08-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenchint: use av_freep() for safetyMichael Niedermayer2014-08-17
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: add -show_data_hash option.Nicolas George2014-08-17
| |
* | vidstabutils: fix indentationTimothy Gu2014-08-17
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Use differential score for analyze()Michael Niedermayer2014-08-16
| | | | | | | | | | | | | | | | This avoids high scores in random data that has a high 0x47 frequency Fixes Ticket3844 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: Add AVFrame based APIMichael Niedermayer2014-08-16
| | | | | | | | | | | | Based on commit fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45 by Luca Barbato <lu_zero@gentoo.org> Adapted for libswresample by Michael Niedermayer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-08-16
|\ \ | | | | | | | | | | | | | | | | | | * cus/stable: mpegts: always parse pcr Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegts: always parse pcrMarton Balint2014-08-16
| | | | | | | | | | | | | | | | | | | | | Previously pcr transmitted without payload but as part of the video stream was not parsed. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | cinedec: add shutter and crop metadataBen Hagen2014-08-16
| | |
* | | avcodec/mips/compute_antialias_float: remove unused variableMichael Niedermayer2014-08-16
| | | | | | | | | | | | | | | Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/hevc_mvs: dont redundantly initialize ref_idx_currMichael Niedermayer2014-08-16
| | | | | | | | | | | | | | | Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/udp: remove unneeded variable initializationMichael Niedermayer2014-08-16
| | | | | | | | | | | | | | | Found-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/udp: dont mix integers with pointersMichael Niedermayer2014-08-16
| | | | | | | | | | | | | | | Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/dvbsubdec: dont mix integers with pointersMichael Niedermayer2014-08-16
| | | | | | | | | | | | | | | Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/dvdsubdec: Dont mix integers with pointersMichael Niedermayer2014-08-16
|/ / | | | | | | | | Reviewed-by: James Darnley <james.darnley@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dict.c: empty dictionaries should be a NULL pointer.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Ensure this is even the case if they are empty because we failed adding the first entry. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | dict.c: Add av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | This allows getting rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat/thp: dont mix integers with pointersMichael Niedermayer2014-08-16
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/lavfutils/ff_load_image: Return error if no frame could be decodedMichael Niedermayer2014-08-16
| | | | | | | | | | Based-on suggestion by JULIAN GARDNER <joolzg@btinternet.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: look for encoding options in both avcodec and avformatClément Bœsch2014-08-15
| | | | | | | | | | | | This patch is the same as 8a1714ad85dd5defdf1fb2baba9ababebfa47d01 but applied to encoding. It fixes the current clash of the -password option between tta decoder and the icecast protocol.
* | Drop remaining unneeded != NULLMichael Niedermayer2014-08-15
| | | | | | | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6': build: Add explanatory comments to (optimization) blocks in the Makefiles Conflicts: libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add explanatory comments to (optimization) blocks in the MakefilesDiego Biurrun2014-08-15
| |
* | Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun2014-08-15
| |
* | vformat/utils: call flush_packet_queue() from avformat_free_context()Michael Niedermayer2014-08-15
| | | | | | | | | | | | This avoids some theoretical memleaks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix packet_buffer memory leak in avformat_free_contextAndrey Myznikov2014-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2': vfwcap: Replace deprecated av_destruct_packet() by av_free_packet() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()Diego Biurrun2014-08-15
| |
* | Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit '7c371754fbc0dcc23bd00278b147f8095ccc5625': atomic_win32: Drop unnecessary atomic.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atomic_win32: Drop unnecessary atomic.h #includeDiego Biurrun2014-08-15
| | | | | | | | The file does not require atomic.h. Also kills function redefinition warnings.
* | Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | * commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc': w32pthreads: Mark functions in compatibility wrapper as av_unused Conflicts: compat/w32pthreads.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32pthreads: Mark functions in compatibility wrapper as av_unusedDiego Biurrun2014-08-15
| | | | | | | | | | | | This avoids annoying warnings about unused functions. The compatibility wrapper is designed to provide a complete (stub) API, so some functions being unused by some files is natural and no reason for a warning.
* | Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit '7ccb847f0f1f28199fa254847b91b6e50fb92832': http: Reduce scope of a variable in parse_content_encoding() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Reduce scope of a variable in parse_content_encoding()Diego Biurrun2014-08-15
| | | | | | | | Also fixes an unused variable warning with zlib disabled.
* | ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer2014-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix streamcopy with side dataChristophe Gisquet2014-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that, when the main packet data buffer is changed, streamcopy uses a temporary new packet to store that buffer, frees the old packet, and replace it with the new packet. However, in doing so, it forgets about the side data, which gets freed, but is still needed and referenced. Then, when the packet gets freed again in the normal code path, it attempts to free its side data which has already been freed. Therefore, simply avoid the first free on side data by removing that side data from the packet. Fixes ticket #3773. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h261dec: Fix context initialization sequenceMichael Niedermayer2014-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a': h261dec: Fix order of initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h261dec: Fix order of initializationJohn Stebbins2014-08-14
| | | | | | | | | | ff_MPV_common_init requires the frame dimensions which get parsed in h261_decode_picture_header.