On Mon, 25 Feb 2013, Diego Biurrun wrote:
Conflicts:libavcodec/Makefile --- Still only for the 0.8 branch, but now with the relevant commit cherry-picked instead of redone. libavcodec/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a4fa4c..da8fd54 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -533,7 +533,8 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o # libavformat dependencies OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_ADX_DEMUXER) += adx.o -OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o +OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o \ + ac3tab.o OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o OBJS-$(CONFIG_DV_MUXER) += dvdata.o OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o flacdata.o flac.o -- 1.7.9.5
Still ok, but I don't see the value of the conflict line in the body as long as there's no reference to which commit it was cherry-picked from (it doesn't add much value on its own). So remove that from the commit message, ok with that change.
// Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
