Skip to content

Skip avio_open when flags of output is AVFMT_NOFILE #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip avio_open when flags of output is AVFMT_NOFILE #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/format/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,15 @@ pub fn output_as<P: AsRef<Path>>(path: &P, format: &str) -> Result<context::Outp
format.as_ptr(),
path.as_ptr(),
) {
0 => match avio_open(&mut (*ps).pb, path.as_ptr(), AVIO_FLAG_WRITE) {
0 => Ok(context::Output::wrap(ps)),
e => Err(Error::from(e)),
0 => {
let output = context::Output::wrap(ps);
if (output.format().flags() & flag::Flags::NO_FILE) == flag::Flags::NO_FILE {
return Ok(output);
}
match avio_open(&mut (*ps).pb, path.as_ptr(), AVIO_FLAG_WRITE) {
0 => Ok(output),
e => Err(Error::from(e)),
}
},

e => Err(Error::from(e)),
Expand All @@ -303,6 +309,10 @@ pub fn output_as_with<P: AsRef<Path>>(
path.as_ptr(),
) {
0 => {
let output = context::Output::wrap(ps);
if (output.format().flags() & flag::Flags::NO_FILE) == flag::Flags::NO_FILE {
return Ok(output);
}
let res = avio_open2(
&mut (*ps).pb,
path.as_ptr(),
Expand All @@ -314,7 +324,7 @@ pub fn output_as_with<P: AsRef<Path>>(
Dictionary::own(opts);

match res {
0 => Ok(context::Output::wrap(ps)),
0 => Ok(output),
e => Err(Error::from(e)),
}
}
Expand Down