[FFmpeg-cvslog] ffmpeg_opt: Fix forcing fourccs

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 05:10:51 2015 +0200| [8750aef3d65c0d52946a9b52eba5f5203280b548] | committer: Michael Niedermayer ffmpeg_opt: Fix forcing fourccs Fixes Ticket4682 Signed-off-by: Michael Niedermayer michae...@gmx.at

[FFmpeg-cvslog] Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:18:30 2015 +0200| [68939f7682de3e87251c6e08470d5779804ddd6d] | committer: Michael Niedermayer Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368' * commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368': Go2Meeting

[FFmpeg-cvslog] Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:22:33 2015 +0200| [9e93e544dc2efa76bce51e59c2435414e38b0291] | committer: Michael Niedermayer Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008' * commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008': g2meet:

[FFmpeg-cvslog] mov: Adjust variable types to fix format warnings

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jun 30 15:38:47 2015 +0200| [2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1] | committer: Vittorio Giovara mov: Adjust variable types to fix format warnings

[FFmpeg-cvslog] mov: Log format rather than fourcc in stsd in trace mode

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jun 30 15:38:48 2015 +0200| [a1e2caa93e4f8102666a21222f01b74838b6497f] | committer: Vittorio Giovara mov: Log format rather than fourcc in stsd in trace mode This will fix remaining format warnings.

[FFmpeg-cvslog] avcodec/aacsbr: check that the element type matches before applying SBR

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 02:05:43 2015 +0200| [79a98294da6cd85f8c86b34764c5e0c43b09eea3] | committer: Michael Niedermayer avcodec/aacsbr: check that the element type matches before applying SBR Fixes out of array access Fixes:

[FFmpeg-cvslog] avcodec/aacsbr: Assert that bs_num_env is positive

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 02:08:25 2015 +0200| [2e13a45b1a9a69456631e582bbb06954d169eb55] | committer: Michael Niedermayer avcodec/aacsbr: Assert that bs_num_env is positive Signed-off-by: Michael Niedermayer michae...@gmx.at

[FFmpeg-cvslog] fate: Avoid unnecessary pixel format conversions

ffmpeg | branch: master | Martin Storsjö mar...@martin.st | Tue Jun 30 22:35:44 2015 +0300| [e2bd03a14a4e3366df0b1ee8e284a97165be1f3c] | committer: Martin Storsjö fate: Avoid unnecessary pixel format conversions Most of the fate-dds-* and fate-txd-* tests already output into the same pixel

[FFmpeg-cvslog] Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:03:20 2015 +0200| [3974889614e04f700637b564df737c180d8583ea] | committer: Michael Niedermayer Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c' * commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c': fate:

[FFmpeg-cvslog] Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:49:52 2015 +0200| [a8e137a32286adddeb08f4f156c16cfe8bbf612e] | committer: Michael Niedermayer Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a' * commit 'df22e30172b09cda4d6f7d4f43508284be65848a': dump: Use

[FFmpeg-cvslog] dump: Use the correct abs() version

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jun 30 15:38:46 2015 +0200| [df22e30172b09cda4d6f7d4f43508284be65848a] | committer: Vittorio Giovara dump: Use the correct abs() version Fix warning from clang absolute value function 'abs' given an argument of type

[FFmpeg-cvslog] Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 04:05:45 2015 +0200| [35c8dda5c2dbeb37c659f964372edf6f2bde3b5f] | committer: Michael Niedermayer Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1' * commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1': mov:

[FFmpeg-cvslog] Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 04:15:27 2015 +0200| [55a04a5d7a90a2eddcfe1fe407c403ba95b281b8] | committer: Michael Niedermayer Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f' * commit 'a1e2caa93e4f8102666a21222f01b74838b6497f': mov: Log

[FFmpeg-cvslog] Go2Meeting decoder

ffmpeg | branch: master | Kostya Shishkov kostya.shish...@gmail.com | Fri Apr 10 12:14:27 2015 +0200| [08c2d8f0aa679c2f060721d1d0d4f33d2ae32368] | committer: Luca Barbato Go2Meeting decoder ELS and ePIC decoder courtesy of Maxim Poliakovski, cleanup and integration by Diego Biurrun.

[FFmpeg-cvslog] g2meet: Add FATE tests for all three G2M variants

ffmpeg | branch: master | Diego Biurrun di...@biurrun.de | Tue Mar 31 16:31:34 2015 +0200| [4d1229dabf7a7e3b6a7b326afd79102256c3b008] | committer: Luca Barbato g2meet: Add FATE tests for all three G2M variants Signed-off-by: Luca Barbato lu_z...@gentoo.org

[FFmpeg-cvslog] Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:37:59 2015 +0200| [818ff7ff5a192c4b0999b375e41f05b6730d] | committer: Michael Niedermayer Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8' * commit '0f87f9b4fceee854f09da2d1ef329245196775f8': lavd: Add

[FFmpeg-cvslog] lavd: Add library identifier

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jun 30 16:43:56 2015 +0200| [0f87f9b4fceee854f09da2d1ef329245196775f8] | committer: Vittorio Giovara lavd: Add library identifier

[FFmpeg-cvslog] lavfi: Add library identifier

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jun 30 16:43:57 2015 +0200| [0d449c81b3dd25835ae6ac849cdd150f35b9c5c6] | committer: Vittorio Giovara lavfi: Add library identifier

[FFmpeg-cvslog] lavc: Add missing API guard to dtg_active_format option

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Tue Jun 30 18:28:26 2015 +0200| [3f872c9bfa8ee1032058cfa48068b5a73ef27b5e] | committer: Vittorio Giovara lavc: Add missing API guard to dtg_active_format option

[FFmpeg-cvslog] Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:40:45 2015 +0200| [9c010ba66800fd335cc389c2a2b664216be985ae] | committer: Michael Niedermayer Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6' * commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6': lavfi: Add

[FFmpeg-cvslog] Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 03:36:21 2015 +0200| [16dd0426e5681ff4ad0752f7fd1d27611e0cb05a] | committer: Michael Niedermayer Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e' * commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e': lavc: Add

[FFmpeg-cvslog] avcodec/elsdec: Remove EOVERFLOW

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Wed Jul 1 04:24:58 2015 +0200| [dec72f8826e3f2032aec463c3dd1e26ec2a4] | committer: Michael Niedermayer avcodec/elsdec: Remove EOVERFLOW EOVERFLOW is not available on all platforms Signed-off-by: Michael Niedermayer

[FFmpeg-cvslog] vp9/update_prob: prevent out of bounds table read

ffmpeg | branch: master | James Zern jz...@google.com | Mon Jun 29 23:03:14 2015 -0700| [e91f860ea74e11e9178500fe8794c47f57dbf48c] | committer: Michael Niedermayer vp9/update_prob: prevent out of bounds table read the max value of the lookup in expanded form is: (((1 7) - 1) 1) - 65 + 1 + 64

[FFmpeg-cvslog] avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 13:45:03 2015 +0200| [5c047f3ad49c8a8a5ae126d134b1004a4dcbc39b] | committer: Michael Niedermayer avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used Signed-off-by: Michael Niedermayer

[FFmpeg-cvslog] configure: Mention hap encoding for --enable-libsnappy.

ffmpeg | branch: master | Carl Eugen Hoyos ceho...@ag.or.at | Tue Jun 30 14:49:07 2015 +0200| [9295ee137ac91a9370435e5673820d8aa9d62cca] | committer: Carl Eugen Hoyos configure: Mention hap encoding for --enable-libsnappy.

[FFmpeg-cvslog] lavc/hapenc: Silence a warning for multithreaded encoding.

ffmpeg | branch: master | Carl Eugen Hoyos ceho...@ag.or.at | Tue Jun 30 14:34:56 2015 +0200| [8080688d0e3d771bb2930457cd64c0f01591e59b] | committer: Carl Eugen Hoyos lavc/hapenc: Silence a warning for multithreaded encoding.

[FFmpeg-cvslog] lavc/j2kenc: Make jp2 output compatible with Kakadu.

ffmpeg | branch: master | Carl Eugen Hoyos ceho...@ag.or.at | Tue Jun 30 14:42:31 2015 +0200| [0f5b99653120ca6d75cb668ff6cc5685dbda345c] | committer: Michael Niedermayer lavc/j2kenc: Make jp2 output compatible with Kakadu. Fixes ticket #4689.

[FFmpeg-cvslog] doc: Add jpeg2000 encoder documentation.

ffmpeg | branch: master | Carl Eugen Hoyos ceho...@ag.or.at | Tue Jun 30 14:42:14 2015 +0200| [e97ec65630d10d8eeeacdd2399bf68ca34eacab5] | committer: Michael Niedermayer doc: Add jpeg2000 encoder documentation.

[FFmpeg-cvslog] avfilter/vf_transpose: Fix rounding error

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 16:01:15 2015 +0200| [0083c16605aa5997534e87e68f97ef85a8c3b7b8] | committer: Michael Niedermayer avfilter/vf_transpose: Fix rounding error Fixes out of array access Fixes:

[FFmpeg-cvslog] avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 19:37:12 2015 +0200| [330863c9f19a23c500ba7901a23f1cc377b353bb] | committer: Michael Niedermayer avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h Fixes out of array access Fixes:

[FFmpeg-cvslog] fate: Update ac3 test to the new request_channel_layout option

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Sat Jun 27 23:36:33 2015 +0200| [3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f] | committer: Vittorio Giovara fate: Update ac3 test to the new request_channel_layout option

[FFmpeg-cvslog] h263: Always check both dimensions

ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Fri Jun 26 15:57:16 2015 +0200| [0a49a62f998747cfa564d98d36a459fe70d3299b] | committer: Vittorio Giovara h263: Always check both dimensions CC: libav-sta...@libav.org Found-By: a...@gentoo.org

[FFmpeg-cvslog] Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 22:13:50 2015 +0200| [2a227fe8799e26fe3c8862438a163f72dca017a5] | committer: Michael Niedermayer Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b' * commit '0a49a62f998747cfa564d98d36a459fe70d3299b': h263:

[FFmpeg-cvslog] avfilter/vf_ssim: fix some cosmetics issues

ffmpeg | branch: master | Paul B Mahol one...@gmail.com | Tue Jun 30 02:20:28 2015 +| [185e76976e8291d42f82972d0b7e103ef4b2d8cd] | committer: Paul B Mahol avfilter/vf_ssim: fix some cosmetics issues Signed-off-by: Paul B Mahol one...@gmail.com

[FFmpeg-cvslog] h264_sei: Group error check outside the switch block

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Sun Jun 28 02:05:04 2015 +0200| [0bfab80a0d9fce0180e8aa2a947267f89b725091] | committer: Vittorio Giovara h264_sei: Group error check outside the switch block

[FFmpeg-cvslog] Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 22:29:34 2015 +0200| [8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3] | committer: Michael Niedermayer Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091' * commit '0bfab80a0d9fce0180e8aa2a947267f89b725091': h264_sei:

[FFmpeg-cvslog] Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 22:51:19 2015 +0200| [7e9c7b623f051eea2e9565a260dae071f873cb42] | committer: Michael Niedermayer Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e' * commit '271ce76d317c5432e151216cf23f12b77ed6cb7e': h264:

[FFmpeg-cvslog] h264: Parse registered data SEI message and AFD value

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Sun Jun 28 12:13:05 2015 +0200| [271ce76d317c5432e151216cf23f12b77ed6cb7e] | committer: Vittorio Giovara h264: Parse registered data SEI message and AFD value Partially based on code by Marton Balint and Kieran Kunhya.

[FFmpeg-cvslog] Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 20:59:36 2015 +0200| [2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016] | committer: Michael Niedermayer Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a' * commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a': h264:

[FFmpeg-cvslog] h264: Allow stream and container cropping at the same time

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Sun Mar 8 04:06:32 2015 +| [3e3056f2a020dd77efdf379dbd4c06a65b4a499a] | committer: Vittorio Giovara h264: Allow stream and container cropping at the same time The container cropping is applied only when difference is

[FFmpeg-cvslog] Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 20:47:13 2015 +0200| [a9aed08fa4e94b19afe343b11e6eea117da5408a] | committer: Michael Niedermayer Merge commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f' * commit '3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f': fate:

[FFmpeg-cvslog] aic: Fix slice size computation for widths multiples of 32 macroblocks

ffmpeg | branch: master | Vittorio Giovara vittorio.giov...@gmail.com | Sun Jun 28 10:50:42 2015 +0200| [303ec065a90498c29d384b4add2ac626bc38d5eb] | committer: Vittorio Giovara aic: Fix slice size computation for widths multiples of 32 macroblocks CC: libav-sta...@libav.org

[FFmpeg-cvslog] Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 21:19:16 2015 +0200| [4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8] | committer: Michael Niedermayer Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb' * commit '303ec065a90498c29d384b4add2ac626bc38d5eb': aic: Fix

[FFmpeg-cvslog] Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 21:36:16 2015 +0200| [cfcb9f5e3628fc8e768836cd4b9b377c24221cf9] | committer: Michael Niedermayer Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a' * commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a': mov:

[FFmpeg-cvslog] mov: Preserve the metadata even when bit-exactness is requested

ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Mon Jun 15 20:40:46 2015 +0200| [e95c7a61852cc5b9ce5445ff034b87553e61958a] | committer: Vittorio Giovara mov: Preserve the metadata even when bit-exactness is requested Make sure to not write the custom `encoder` string in that case.

[FFmpeg-cvslog] Merge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 22:01:22 2015 +0200| [5585da7c5e47810b8433f54bea5ff947251b3055] | committer: Michael Niedermayer Merge commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f' * commit '6f4cd33efb5a9ec75db1677d5f7846c60337129f': cosmetic:

[FFmpeg-cvslog] cosmetic: Reformat ff_h263_decode_mba

ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Fri Jun 26 15:57:15 2015 +0200| [6f4cd33efb5a9ec75db1677d5f7846c60337129f] | committer: Vittorio Giovara cosmetic: Reformat ff_h263_decode_mba

[FFmpeg-cvslog] configure: fix hevc_vdpau_hwaccel dependencies

ffmpeg | branch: master | James Almer jamr...@gmail.com | Tue Jun 30 04:09:58 2015 -0300| [6415dcb0131845489cb4e0ad7bd723694f98e060] | committer: James Almer configure: fix hevc_vdpau_hwaccel dependencies Signed-off-by: James Almer jamr...@gmail.com

[FFmpeg-cvslog] avformat: rename asfdec.c to asfdec_f.c

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 11:45:14 2015 +0200| [8f9c39b3e8c99ffe8a75603138c37c711d9ae72f] | committer: Michael Niedermayer avformat: rename asfdec.c to asfdec_f.c leaving it as asfdec.c confuses git Signed-off-by: Michael Niedermayer

[FFmpeg-cvslog] Rename asfdec-o.c to asfdec_o.c

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 11:57:35 2015 +0200| [0d5a27c2b5a1a2981f53aa5c093d1ddcc4ff472b] | committer: Michael Niedermayer Rename asfdec-o.c to asfdec_o.c Most files use _ instead of - as spacer, so this is more consistent Signed-off-by:

[FFmpeg-cvslog] Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 12:24:12 2015 +0200| [3cd6b6aa0f847afeeac7742489f139ce39b4bdcb] | committer: Michael Niedermayer Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68' * commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68': asf: Do

[FFmpeg-cvslog] asf: Do not skip data streams

ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Sun Jun 28 17:03:02 2015 +0200| [5bdfc17189e4ea63c6b46b6d5256852fcb409d68] | committer: Luca Barbato asf: Do not skip data streams http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bdfc17189e4ea63c6b46b6d5256852fcb409d68 ---

[FFmpeg-cvslog] Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 12:59:16 2015 +0200| [6d9dfb1267d0a5b23ed3e857526bbca74223313a] | committer: Michael Niedermayer Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501' * commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501': riff:

[FFmpeg-cvslog] riff: Validate the wav header size before trying to parse it

ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Sun Jun 28 17:32:40 2015 +0200| [1b4c468477f3b8d372da8ef4e5405539ad9c1501] | committer: Luca Barbato riff: Validate the wav header size before trying to parse it

[FFmpeg-cvslog] mpegts: Add jpeg2000 stream type

ffmpeg | branch: master | John Högberg john.hogb...@ericsson.com | Mon Jun 29 14:57:20 2015 +0200| [42bc768e5240ec01237ad2eb7c69b917158de258] | committer: Luca Barbato mpegts: Add jpeg2000 stream type Signed-off-by: Luca Barbato lu_z...@gentoo.org

[FFmpeg-cvslog] Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'

ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Tue Jun 30 13:08:26 2015 +0200| [088b410ea2eebcfdf57f7e0c419fe6be8d440eb6] | committer: Michael Niedermayer Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258' * commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts:

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

ffmpeg | branch: master | Andreas Cadhalpun andreas.cadhal...@googlemail.com | Tue Jun 30 21:01:29 2015 +0200| [32a5b631267e1f8bf279e407039b9a99d012d033] | committer: Andreas Cadhalpun pthread_frame: forward error codes when flushing This is the first part of the fix for ticket #4370.

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

ffmpeg | branch: master | Andreas Cadhalpun andreas.cadhal...@googlemail.com | Tue Jun 30 21:09:50 2015 +0200| [bd0f14123fd8c7ff1c27b726d143f84c67f3a522] | committer: Andreas Cadhalpun ffmpeg: only count got_output/errors in decode_error_stat If threading is used, the first (thread_count - 1)

[FFmpeg-cvslog] avcodec/h264: Greenmetadata SEI parsing

ffmpeg | branch: master | Nicolas DEROUINEAU nicolas.derouin...@vitec.com | Tue Jun 30 15:17:59 2015 +0200| [04a68f43488c2b6796f1e24c87122f814b785e88] | committer: Michael Niedermayer avcodec/h264: Greenmetadata SEI parsing Signed-off-by: Michael Niedermayer michae...@gmx.at

[FFmpeg-cvslog] ffmpeg: windows: respond to logoff and ctrl+break messages as well

ffmpeg | branch: master | rogerdpack rogerpack2...@gmail.com | Tue Jun 30 16:31:19 2015 -0600| [4ebb43f19c416e1601730ca9ae57749b1385c563] | committer: Michael Niedermayer ffmpeg: windows: respond to logoff and ctrl+break messages as well Signed-off-by: Michael Niedermayer michae...@gmx.at

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

ffmpeg | branch: master | Andreas Cadhalpun andreas.cadhal...@googlemail.com | Tue Jun 30 21:06:40 2015 +0200| [cd64ead8d96b2d2c300e0ac620fb82b17d6051bf] | committer: Andreas Cadhalpun ffmpeg: exit_on_error if decoding a packet failed This is the second part of the fix for ticket #4370.