highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

Browse Source 
* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme

Conflicts:
	libavdevice/Makefile
	libavdevice/alsa.h
	libavdevice/alsa_dec.c
	libavdevice/alsa_enc.c
	libavdevice/sndio_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-09 21:36:42 +02:00
parent 259fd4c7cf 8d26c193fb
commit b1b58310d0
14 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavdevice/sndio_dec.c
View File

@@ -29,7 +29,7 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "sndio_common.h"
#include "libavdevice/sndio.h"
static av_cold int audio_read_header(AVFormatContext *s1)
{