[FFmpeg-cvslog] avutil/softfloat: move av_sincos_sf() back to header

ffmpeg | branch: master | James Almer | Wed Jul 22 22:10:50 2015 -0300| [a176bbc873b13430c683625744cb15bd659fcd58] | committer: James Almer avutil/softfloat: move av_sincos_sf() back to header Fixes compilation of host tool aacps_fixed_tablegen Reviewed-by: Michael Niedermayer Signed-off-by:

[FFmpeg-cvslog] libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c

ffmpeg | branch: master | Ivan Uskov | Mon Jul 20 11:07:34 2015 -0400| [1acb19d12bcd259c3b2be39fb3149ced5916b56e] | committer: Michael Niedermayer libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c Signed-off-by: Michael Niedermayer

[FFmpeg-cvslog] wavpack: use get_bits_long to read up to 32 bits

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Sat Jun 27 20:16:12 2015 +0200| [21769e3884ea6a5e1c063219f5b9dd04f6e3207d] | committer: Michael Niedermayer wavpack: use get_bits_long to read up to 32 bits get_bits should not be used for more than 25 bits. Reviewed-by: Michael Niedermayer

[FFmpeg-cvslog] update changelog

ffmpeg | branch: release/2.6 | Michael Niedermayer | Thu Jul 23 02:05:35 2015 +0200| [b17cec526214dff9d6ac1d97b70167d15a4e14d7] | committer: Michael Niedermayer update changelog Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b17cec526214dff9d6a

[FFmpeg-cvslog] imc: use correct position for flcoeffs2 calculation

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Fri Jul 10 21:50:50 2015 +0200| [088733414a65813633ec52aa94936302231e329c] | committer: Michael Niedermayer imc: use correct position for flcoeffs2 calculation flcoeffs2[pos] should be the log2 of flcoeffs1[pos]. flcoeffs1[0] can be 0 here, th

[FFmpeg-cvslog] nutdec: check maxpos in read_sm_data before returning success

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Sat Jun 27 17:50:56 2015 +0200| [a3d3e0a6bc392025538276614d55a4be2d897d7e] | committer: Michael Niedermayer nutdec: check maxpos in read_sm_data before returning success Otherwise sm_size can be larger than size, which results in a negative pa

[FFmpeg-cvslog] mpegaudiodec: copy AVFloatDSPContext from first context to all contexts

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Fri Jun 26 00:27:54 2015 +0200| [874b3117ed6222d620d380b3f0e20c176339cf68] | committer: Michael Niedermayer mpegaudiodec: copy AVFloatDSPContext from first context to all contexts This fixes a segfault when decoding multi-channel MP3onMP4 file

[FFmpeg-cvslog] ffmpeg: only count got_output/errors in decode_error_stat

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Tue Jun 30 21:09:50 2015 +0200| [7f84858dcf49bc747805b247151b96de7606555a] | committer: Michael Niedermayer ffmpeg: only count got_output/errors in decode_error_stat If threading is used, the first (thread_count - 1) packets are read before an

[FFmpeg-cvslog] hevc: check slice address length

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Fri Jul 10 19:41:43 2015 +0200| [44a9e2dbba3ad3c5543a3e355dd44641eafe0fa8] | committer: Michael Niedermayer hevc: check slice address length It is used as get_bits argument and reading 0 bits isn't supported. Reviewed-by: Michael Niedermayer

[FFmpeg-cvslog] ffmpeg: exit_on_error if decoding a packet failed

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Tue Jun 30 21:06:40 2015 +0200| [32df1cd6ac09bc52d5a4cadf4053aeb113472f8d] | committer: Michael Niedermayer ffmpeg: exit_on_error if decoding a packet failed This is the second part of the fix for ticket #4370. Reviewed-by: Michael Niedermaye

[FFmpeg-cvslog] webp: fix infinite loop in webp_decode_frame

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Thu Jul 2 23:45:46 2015 +0200| [3c96f21d6e9de6832a59645273e94dfd65126d2d] | committer: Michael Niedermayer webp: fix infinite loop in webp_decode_frame The loop always needs at least 8 bytes for chunk_type and chunk_size. If fewer are left, b

[FFmpeg-cvslog] snow: remove an obsolete av_assert2

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Thu Jul 9 19:50:34 2015 +0200| [2d89356641f89cad9dc4ee961fa1cecf1e0f548e] | committer: Michael Niedermayer snow: remove an obsolete av_assert2 It asserts that the frame linesize is larger than 37, but it can be smaller and decoding such frame

[FFmpeg-cvslog] huffyuvdec: validate image size

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Sun Jun 28 11:21:54 2015 +0200| [dc85a75332638b31fc68660f9dccae2c90ce3c18] | committer: Michael Niedermayer huffyuvdec: validate image size Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun (cherry picked from commit 9a345802

[FFmpeg-cvslog] wavpack: limit extra_bits to 32 and use get_bits_long

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Thu Jul 2 23:05:05 2015 +0200| [e812220a304de49abe2a9553692dfd487ec9a888] | committer: Michael Niedermayer wavpack: limit extra_bits to 32 and use get_bits_long More than 32 bits can't be stored in an integer and get_bits should not be used w

[FFmpeg-cvslog] vc1dec: use get_bits_long and limit the read bits to 32

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Thu Jun 25 22:47:38 2015 +0200| [fdf166c5d2bb0e0d1771cfabcdf66f3c3391cac2] | committer: Michael Niedermayer vc1dec: use get_bits_long and limit the read bits to 32 get_bits should not be used with more than 25 bits. Reviewed-by: Michael Niede

[FFmpeg-cvslog] pthread_frame: forward error codes when flushing

ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Tue Jun 30 21:01:29 2015 +0200| [a0f50ddcb83117a7202f0e65e0416b4f6e4ef383] | committer: Michael Niedermayer pthread_frame: forward error codes when flushing This is the first part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer

[FFmpeg-cvslog] tests/checkasm/h264pred: Use LOCAL_ALIGNED_16()

ffmpeg | branch: master | Michael Niedermayer | Thu Jul 23 00:35:18 2015 +0200| [f467fc02b475cd45b68aa5fb5f7c78286110ba86] | committer: Michael Niedermayer tests/checkasm/h264pred: Use LOCAL_ALIGNED_16() Fixes alignment issue and bus errors Signed-off-by: Michael Niedermayer > http://git.vi

[FFmpeg-cvslog] tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()

ffmpeg | branch: master | Michael Niedermayer | Thu Jul 23 00:35:18 2015 +0200| [9e83ac6114de3d94eb992eff8ed810234069a7b2] | committer: Michael Niedermayer tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16() Fixes alignment issue and bus errors Signed-off-by: Michael Niedermayer > http://git.vi

[FFmpeg-cvslog] Edit documentation and versioning for the fixed point AAC decoder

ffmpeg | branch: master | Jovan Zelincevic | Mon Jul 20 13:36:22 2015 +0200| [9e3135f49e45ec6b26c5b7c3fea481bf85ad64d6] | committer: Michael Niedermayer Edit documentation and versioning for the fixed point AAC decoder Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/f

[FFmpeg-cvslog] avcodec: Minor macro polishing

ffmpeg | branch: master | Nedeljko Babic | Mon Jul 20 13:36:20 2015 +0200| [a9d986c2ced87d074ba307f9d6f213c5caae88ee] | committer: Michael Niedermayer avcodec: Minor macro polishing Use macros from aac_defines.h for adding suffixes instead of local macros. Signed-off-by: Nedeljko Babic Sign

[FFmpeg-cvslog] fate: Make ffprobe tests depend on avdevice

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 19:25:26 2015 +0200| [4845f6687d4f1ddcb1ed57b09b09f284e8500fc1] | committer: Michael Niedermayer fate: Make ffprobe tests depend on avdevice The test file they use needs avdevice to be created Probably fixes Ticket 4455 Reviewed-by:

[FFmpeg-cvslog] avcodec: Table creation for AAC_fixed_decoder (PS-module)

ffmpeg | branch: master | Jovan Zelincevic | Mon Jul 20 13:36:18 2015 +0200| [631496e057a203e656d0a952acecf217a83bb26b] | committer: Michael Niedermayer avcodec: Table creation for AAC_fixed_decoder (PS-module) Add fixed point implementation of functions for generating tables. Signed-off-by:

[FFmpeg-cvslog] avcodec: Implementation of AAC_fixed_decoder (PS-module)

ffmpeg | branch: master | Djordje Pesut | Mon Jul 20 13:36:19 2015 +0200| [5fd81cf6f082ed00878a5898f47550cb1646d219] | committer: Michael Niedermayer avcodec: Implementation of AAC_fixed_decoder (PS-module) Add fixed point implementation. Signed-off-by: Nedeljko Babic Signed-off-by: Michael

[FFmpeg-cvslog] tests: Add aac_fixed decoder test

ffmpeg | branch: master | Nedeljko Babic | Mon Jul 20 13:36:21 2015 +0200| [978a8540b6ced36f948a43c2671ee4c27ff5deb1] | committer: Michael Niedermayer tests: Add aac_fixed decoder test Signed-off-by: Nedeljko Babic Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmp

[FFmpeg-cvslog] avcodec: remove unused sd variables

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 21:01:56 2015 +0200| [5362df2ee383e2d507d521f885e7fda2589e3998] | committer: Michael Niedermayer avcodec: remove unused sd variables Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5362d

[FFmpeg-cvslog] avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 21:01:00 2015 +0200| [3d083f6ffd8c76f7ded34db7120aa9f99e0c4556] | committer: Michael Niedermayer avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer > http://git.vi

[FFmpeg-cvslog] avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 20:46:52 2015 +0200| [caba19a5becce2e867fc0ff7c3466c57736f49ad] | committer: Michael Niedermayer avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly Signed-off-by: Michael Niedermayer > http://git.videolan.org/git

[FFmpeg-cvslog] avcodec/libx264: Export choosen pict_type

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 20:49:01 2015 +0200| [975257ffe6501c2017d2d6e7d912abfa168881b3] | committer: Michael Niedermayer avcodec/libx264: Export choosen pict_type Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h

[FFmpeg-cvslog] avcodec/libxavs: Export pict_type in side data

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 19:52:04 2015 +0200| [557e011bf16758a7379afc584cb0b1f5f64b30ed] | committer: Michael Niedermayer avcodec/libxavs: Export pict_type in side data Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=com

[FFmpeg-cvslog] Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS

ffmpeg | branch: master | Michael Niedermayer | Tue Jul 21 13:23:29 2015 +0200| [c40ecffd31d0e0be531425e48a98c1a8fcaaffa2] | committer: Michael Niedermayer Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS The stats are a superset of the quality factor, also allowing the picture

[FFmpeg-cvslog] apng: Fix decoding images with the PREVIOUS dispose op

ffmpeg | branch: master | Donny Yang | Sun Jul 19 02:43:20 2015 +| [a906e86a8dbd70d1ca858abc498c25e536fa87a9] | committer: Paul B Mahol apng: Fix decoding images with the PREVIOUS dispose op > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a906e86a8dbd70d1ca858abc498c25e536fa87a9

[FFmpeg-cvslog] mpegvideo: Add missing include

ffmpeg | branch: master | Vittorio Giovara | Mon Jul 20 18:24:19 2015 +0100| [21c90d86d27c2143354c7d782050a779b0986eb1] | committer: Vittorio Giovara mpegvideo: Add missing include > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21c90d86d27c2143354c7d782050a779b0986eb1 --- libavc

[FFmpeg-cvslog] Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 18:07:43 2015 +0200| [1d7fa1ac8932d37fd6b6dde6b3cef33d38c21536] | committer: Michael Niedermayer Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1' * commit '21c90d86d27c2143354c7d782050a779b0986eb1': mpegvideo: Add missing incl

[FFmpeg-cvslog] Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 17:39:41 2015 +0200| [d231d2be7101619ac1db114324bd7890a6a555e5] | committer: Michael Niedermayer Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a' * commit 'a16854892c3af945d3ab0015699a0c9884f0a89a': dds: Add a rgba fate test

[FFmpeg-cvslog] dds: Add a rgba fate test

ffmpeg | branch: master | Vittorio Giovara | Mon Jul 20 23:47:14 2015 +0100| [a16854892c3af945d3ab0015699a0c9884f0a89a] | committer: Vittorio Giovara dds: Add a rgba fate test > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a16854892c3af945d3ab0015699a0c9884f0a89a --- tests/fate/

[FFmpeg-cvslog] avfilter: add deband filter

ffmpeg | branch: master | Paul B Mahol | Fri Jul 10 16:16:53 2015 +| [787d370e1424bab113c1681b4534f9d8da2e93ef] | committer: Paul B Mahol avfilter: add deband filter Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=787d370e1424bab113c1681b4534f9d8da2

[FFmpeg-cvslog] Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 17:26:37 2015 +0200| [05cf687d130a976d96051f6f6bdb63cf724d3709] | committer: Michael Niedermayer Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c' * commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c': dds: Fix palette decoding

[FFmpeg-cvslog] dds: Fix palette decoding

ffmpeg | branch: master | Vittorio Giovara | Mon Jul 20 23:47:12 2015 +0100| [57214b2f7f9b1ccfd61e232e8989b5ee850f169c] | committer: Vittorio Giovara dds: Fix palette decoding Red and blue channels were decoded in the wrong order. Found-By: ami_stuff > http://git.videolan.org/gitweb.cgi/ffmp

[FFmpeg-cvslog] Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 17:29:34 2015 +0200| [b68e445f9b34eb33a54359340eec66b800269587] | committer: Michael Niedermayer Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221' * commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221': dds: Fix 32bpp bitmaps deco

[FFmpeg-cvslog] dds: Fix 32bpp bitmaps decoding

ffmpeg | branch: master | Michael Niedermayer | Mon Jul 20 23:47:13 2015 +0100| [d08d8b61aa9f07d3ea993fe5392f7408c958d221] | committer: Vittorio Giovara dds: Fix 32bpp bitmaps decoding Found-By: ami_stuff Signed-off-by: Vittorio Giovara > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=comm

[FFmpeg-cvslog] Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 17:13:38 2015 +0200| [eaf15bba03b4067cb56b704ebc2e0b36a501ef22] | committer: Michael Niedermayer Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4' * commit 'ea4d46e72945cba37feb7aa154eb970732f513e4': dds: Fix enum declaration

[FFmpeg-cvslog] dds: Fix enum declaration

ffmpeg | branch: master | Vittorio Giovara | Wed Jul 22 13:20:07 2015 +0100| [ea4d46e72945cba37feb7aa154eb970732f513e4] | committer: Vittorio Giovara dds: Fix enum declaration Drop the global variables with anonymous enum type. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea4d4

[FFmpeg-cvslog] Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 17:13:15 2015 +0200| [6b9be608ce926ff2f858936e2aac4115400887cc] | committer: Michael Niedermayer Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec' * commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec': asfdec: avoid crash in the

[FFmpeg-cvslog] asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

ffmpeg | branch: master | Alexandra Hájková | Tue Jul 21 10:45:01 2015 +0200| [2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec] | committer: Anton Khirnov asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0 Signed-off-by: Anton Khirnov > http://git.videolan.org/gitweb.cgi/ffmpeg.git

[FFmpeg-cvslog] Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 17:06:16 2015 +0200| [fa7defc89a7b6716aa853451134e5663cabb902d] | committer: Michael Niedermayer Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd' * commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd': asfdec: close the demuxer p

[FFmpeg-cvslog] asfdec: close the demuxer properly when read_header is failing

ffmpeg | branch: master | Alexandra Hájková | Fri Jul 17 14:17:02 2015 +0200| [93f16f338f9e8aba0c006752eb3afc3fe6e137fd] | committer: Anton Khirnov asfdec: close the demuxer properly when read_header is failing Signed-off-by: Anton Khirnov > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=c

[FFmpeg-cvslog] Merge commit '5655236a67203d923755f285584c6e68abe7e33f'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 16:53:20 2015 +0200| [fce350be0e7595846a6ce1a28bf240967283643e] | committer: Michael Niedermayer Merge commit '5655236a67203d923755f285584c6e68abe7e33f' * commit '5655236a67203d923755f285584c6e68abe7e33f': asfdec: factor out seeking

[FFmpeg-cvslog] asfdec: factor out seeking to the Data Object outside while

ffmpeg | branch: master | Alexandra Hájková | Tue Jul 21 09:14:39 2015 +0200| [5655236a67203d923755f285584c6e68abe7e33f] | committer: Anton Khirnov asfdec: factor out seeking to the Data Object outside while return INVALIDDARA if Data Object was not found Signed-off-by: Anton Khirnov > http

[FFmpeg-cvslog] checkasm: remove empty array initializer list in h264pred test

ffmpeg | branch: master | Janne Grunau | Mon Jul 20 23:17:57 2015 +0200| [e605bf3b590d295f215fcc9fd58eb11be55b68cb] | committer: Janne Grunau checkasm: remove empty array initializer list in h264pred test Fixes MSVC compilation. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e605

[FFmpeg-cvslog] Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 16:46:01 2015 +0200| [fbdbe7a5d262db06ae44a7bd606d18954241c040] | committer: Michael Niedermayer Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c' * commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c': qsvenc_hevc: use the correc

[FFmpeg-cvslog] qsvenc_hevc: use the correct HW plugin UID

ffmpeg | branch: master | Anton Khirnov | Sun Jul 19 11:24:36 2015 +0200| [ecee1148af4989e1f9e16f0cdc9f98ad2045538c] | committer: Anton Khirnov qsvenc_hevc: use the correct HW plugin UID > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecee1148af4989e1f9e16f0cdc9f98ad2045538c ---

[FFmpeg-cvslog] Merge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 16:38:12 2015 +0200| [e1b5a2e46ef0734d149c2cbbc8a5a82be100c617] | committer: Michael Niedermayer Merge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb' * commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb': checkasm: remove empty arra

[FFmpeg-cvslog] checkasm: Always link statically

ffmpeg | branch: master | Luca Barbato | Tue Jul 21 23:22:42 2015 +0200| [3ae0e721c7b6e0483801b9039b3d140e3b68b7f5] | committer: Luca Barbato checkasm: Always link statically Checkasm needs to use internal symbols that should not be made public. > http://git.videolan.org/gitweb.cgi/ffmpeg.git

[FFmpeg-cvslog] Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 16:30:29 2015 +0200| [c1692439e081dcc259489a1c2ddc2a659870dce6] | committer: Michael Niedermayer Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5' * commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5': checkasm: Always link stati

[FFmpeg-cvslog] Support the Hap chunked frame format

ffmpeg | branch: master | Tom Butterworth | Tue Jul 21 01:12:12 2015 +0100| [c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb] | committer: Michael Niedermayer Support the Hap chunked frame format Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7e64434

[FFmpeg-cvslog] avformat/asfdec_f: Parse ECC byte according to spec

ffmpeg | branch: master | Michael Niedermayer | Wed Jul 22 13:49:31 2015 +0200| [9837d3b06844f6cb24e36bdbcce55c03f8241eb4] | committer: Michael Niedermayer avformat/asfdec_f: Parse ECC byte according to spec This should not change anything as the spec requires specific values for the fields, w

[FFmpeg-cvslog] avcodec: loongson optimize pixblockdsp with mmi

ffmpeg | branch: master | 周晓勇 | Wed Jul 22 15:10:38 2015 +0800| [3e35f8efa18d9b77bbdb16d9c61e387241a7bd83] | committer: Michael Niedermayer avcodec: loongson optimize pixblockdsp with mmi Signed-off-by: ZhouXiaoyong Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffm

[FFmpeg-cvslog] lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.

ffmpeg | branch: master | Carl Eugen Hoyos | Wed Jul 22 10:23:18 2015 +0200| [35b33f1a195c392bca374b3a49b7a18811effe56] | committer: Carl Eugen Hoyos lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35b33f1a195c392bca374b3a49b7a188

[FFmpeg-cvslog] Cosmetics: Reindent after last commit.

ffmpeg | branch: master | Carl Eugen Hoyos | Wed Jul 22 10:25:10 2015 +0200| [6b2bb3d231f81780b0bb12193e9ca29ddf2c474a] | committer: Carl Eugen Hoyos Cosmetics: Reindent after last commit. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b2bb3d231f81780b0bb12193e9ca29ddf2c474a ---