aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNigel Taylor <njtaylor0101@gmail.com>2013-03-26 17:44:44 -0700
committerNigel Taylor <njtaylor0101@gmail.com>2013-03-26 17:44:44 -0700
commit06860ae3cde100007c87b554853bb86a7603b514 (patch)
treedd5cdcdd96855add54ec9643b79f631d1ef30759
parent76d5737290c95a236ed87171d014000a66a43ab5 (diff)
parent8ec63ea696450b0f6b7b618e84429b6b4d7e0916 (diff)
downloadget-flash-videos-06860ae3cde100007c87b554853bb86a7603b514.tar.gz
Merge pull request #110 from njtaylor/master
Update
-rwxr-xr-xget_flash_videos2
-rw-r--r--lib/FlashVideo/Site/Svtplay.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/get_flash_videos b/get_flash_videos
index 8aaa6fc..befae4a 100755
--- a/get_flash_videos
+++ b/get_flash_videos
@@ -410,7 +410,7 @@ sub download {
if(ref $data eq 'HASH') {
if (defined($data->{downloader}) && $data->{downloader} eq "ffmpeg") {
$downloader = FlashVideo::FFmpegDownloader->new;
- $file ||= $data->{file};
+ $file ||= $data->{flv};
} else {
# RTMP data
$downloader = FlashVideo::RTMPDownloader->new;
diff --git a/lib/FlashVideo/Site/Svtplay.pm b/lib/FlashVideo/Site/Svtplay.pm
index e588a95..9a52156 100644
--- a/lib/FlashVideo/Site/Svtplay.pm
+++ b/lib/FlashVideo/Site/Svtplay.pm
@@ -108,7 +108,7 @@ sub find_video {
return {
downloader => "ffmpeg",
- file => $filename,
+ flv => $filename,
args => \@ffmpeg_args
};
} else {