diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-01-23 18:44:26 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-01-23 18:44:26 +0000 |
| commit | a5df11ab1e0e2c4bc4218a6543f6dfaf7169d4e4 (patch) | |
| tree | dca1f67007c2d39e22797537144681190ee7e77a /libavformat/dv1394.c | |
| parent | 7f172339fdcdeb0393c1a296da95acb6fc57d3b8 (diff) | |
| download | ffmpeg-streaming-a5df11ab1e0e2c4bc4218a6543f6dfaf7169d4e4.zip ffmpeg-streaming-a5df11ab1e0e2c4bc4218a6543f6dfaf7169d4e4.tar.gz | |
dv1394 channel selection by Max Krasnyansky - modified channel number to be in base 10 by default
Originally committed as revision 1500 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/dv1394.c')
| -rw-r--r-- | libavformat/dv1394.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/dv1394.c b/libavformat/dv1394.c index f0b5e8d..2c70827 100644 --- a/libavformat/dv1394.c +++ b/libavformat/dv1394.c @@ -84,7 +84,11 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap dv->width = DV1394_WIDTH; dv->height = DV1394_HEIGHT; - dv->channel = ap->channel; + + if (ap->channel) + dv->channel = ap->channel; + else + dv->channel = DV1394_DEFAULT_CHANNEL; dv->frame_rate = 30; |
