diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-07 03:37:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-07 03:37:57 +0200 |
| commit | 174df6affc4e2cfdc6c91c1be3c3e1a8a794cf78 (patch) | |
| tree | a77673fd1d752a54bf812b187eb80d066c7cc49f /libavformat/flvenc.c | |
| parent | 3a1aaf7b21c7bde9f4c3d5342baa64d3e940d05f (diff) | |
| parent | b9c6c7cb25932b594fd684a0cb553e439d49fe12 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: remove empty $(OBJS) target
build: make rule for linking ff* apply only to these targets
build: rearrange some lines in a more logical way
s302m: fix resampling for 16 and 24bits.
ARM: remove MUL64 and MAC64 inline asm
build: clean up .PHONY lists
build: move all (un)install* target aliases to toplevel Makefile
flvenc: propagate error properly
build: remove stale dependency
build: do not add CFLAGS-yes to CFLAGS
utils.c: fix crash with threading enabled.
configure: simplify source_path setup
configure: remove --source-path option
lavf: deprecate AVFormatParameters.time_base.
img2: add framerate private option.
img2: add video_size private option.
img2: add pixel_format private option.
tty: add framerate private option.
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
| -rw-r--r-- | libavformat/flvenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 3e933ce922..b6bd72a1d6 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -440,7 +440,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) av_free(data); - return 0; + return pb->error; } AVOutputFormat ff_flv_muxer = { |