[FFmpeg-devel] [PULL|TRIVIAL] libavdevice/decklink_common.h: fix broken build due to missing `/`

[Michael Niedermayer]

On Fri, Jan 29, 2016 at 07:17:41AM -0500, Michael Ira Krufky wrote:
> The build in the master branch is currently broken due to a missing
> `/` in a comment introduced by commit
> 44304ae3220f553d0b1458644e2a617ea1ad8d22
> 
> Please merge my branch or apply the 1-liner patch below
> 
> The following changes since commit b91093a4111ffc947f3387325a377bb1694a87dd:
> 
>   ffmpeg: replace "flush Media" with "flush_media" in benchmark_all
> output (2016-01-29 10:58:18 +0100)
> 
> are available in the git repository at:
> 
>   https://github.com/mkrufky/FFmpeg.git build-fix
> 
> for you to fetch changes up to 7392837dba1242e49230538a100b0ffd11cf391d:
> 
>   libavdevice/decklink_common.h: fix broken build due to missing `/`
> (2016-01-29 06:54:36 -0500)
> 
> ----------------------------------------------------------------
> Michael Ira Krufky (1):
>       libavdevice/decklink_common.h: fix broken build due to missing `/`
> 
>  libavdevice/decklink_common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 
> From 7392837dba1242e49230538a100b0ffd11cf391d Mon Sep 17 00:00:00 2001
> From: Michael Ira Krufky <mkrufky at linuxtv.org>
> Date: Fri, 29 Jan 2016 06:49:46 -0500
> Subject: [PATCH] libavdevice/decklink_common.h: fix broken build due to
>  missing `/`
> 
> Signed-off-by: Michael Ira Krufky <mkrufky at linuxtv.org>
> ---
>  libavdevice/decklink_common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
> index 1e266d5..dff4fc1 100644
> --- a/libavdevice/decklink_common.h
> +++ b/libavdevice/decklink_common.h
> @@ -106,4 +106,4 @@ int ff_decklink_set_format(AVFormatContext *avctx,
> decklink_direction_t directio
>  int ff_decklink_list_devices(AVFormatContext *avctx);
>  int ff_decklink_list_formats(AVFormatContext *avctx,
> decklink_direction_t direction = DIRECTION_OUT);
> 
> -#endif /* AVDEVICE_DECKLINK_COMMON_H *
> +#endif /* AVDEVICE_DECKLINK_COMMON_H */

applied

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160129/230dc0ec/attachment.sig>